diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshConnectionManager.kt b/app/src/main/java/com/geeksville/mesh/service/MeshConnectionManager.kt
index 795276186..54cd877c0 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshConnectionManager.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshConnectionManager.kt
@@ -134,7 +134,10 @@ constructor(
     }
 
     private fun handleConnected() {
-        connectionStateHolder.setState(ConnectionState.Connecting)
+        // The service state remains 'Connecting' until config is fully loaded
+        if (connectionStateHolder.connectionState.value == ConnectionState.Disconnected) {
+            connectionStateHolder.setState(ConnectionState.Connecting)
+        }
         serviceBroadcasts.broadcastConnection()
         Logger.d { "Starting connect" }
         connectTimeMsec = System.currentTimeMillis()