diff --git a/client/internal/connect.go b/client/internal/connect.go
index 17fc20c42..68a0cb8da 100644
--- a/client/internal/connect.go
+++ b/client/internal/connect.go
@@ -331,8 +331,11 @@ func (c *ConnectClient) run(mobileDependency MobileDependency, runningChan chan
 		state.Set(StatusConnected)
 
 		if runningChan != nil {
-			close(runningChan)
-			runningChan = nil
+			select {
+			case <-runningChan:
+			default:
+				close(runningChan)
+			}
 		}
 
 		<-engineCtx.Done()