diff --git a/mutiny-core/src/hermes.rs b/mutiny-core/src/hermes.rs
index 4a730b25d..4ad94cf77 100644
--- a/mutiny-core/src/hermes.rs
+++ b/mutiny-core/src/hermes.rs
@@ -180,6 +180,11 @@ impl<S: MutinyStorage> HermesClient<S> {
                                 o.name
                             );
                             *c = (o.name.clone(), true);
+
+                            // if we don't have a lightning address, no need to continue
+                            if o.name.is_none() {
+                                break;
+                            }
                         }
 
                         // check that federation is still the same