diff --git a/sat/plugins/plugin_xep_0384.py b/sat/plugins/plugin_xep_0384.py
index 7b6a23a4..689ef149 100644
--- a/sat/plugins/plugin_xep_0384.py
+++ b/sat/plugins/plugin_xep_0384.py
@@ -820,6 +820,12 @@ class OMEMO(object):
                             problem.device)
                         expect_problems.setdefault(problem.bare_jid, set()).add(
                             problem.device)
+            elif isinstance(problem, omemo_excpt.NoEligibleDevicesException):
+                if untrusted or found_bundles:
+                    # we may have new devices after this run, so let's continue for now
+                    continue
+                else:
+                    raise problem
             else:
                 raise problem