diff --git a/src/rosegold/client.cr b/src/rosegold/client.cr
index 5def43af..eb484d37 100644
--- a/src/rosegold/client.cr
+++ b/src/rosegold/client.cr
@@ -96,9 +96,11 @@ class Rosegold::Client < Rosegold::EventEmitter
 
   def start_ticker
     spawn do
-      while connected?
+      loop do
         sleep 1.tick
 
+        break unless connected?
+
         spawn do
           interactions.tick
           physics.tick