diff --git a/Shared/PongUniverse.cs b/Shared/PongUniverse.cs
index d37c68c..65c464e 100644
--- a/Shared/PongUniverse.cs
+++ b/Shared/PongUniverse.cs
@@ -19,7 +19,7 @@ public static class PongUniverse
     {
         LiteNetLibClient client = universe.InstantiateUniverseObject().SetUniverseObject("Client").BehaviourController.AddBehaviour<LiteNetLibClient>();
         client.BehaviourController.AddBehaviour<NetworkManager>();
-        client.Connect(server, port);
+        universe.OnPreUpdate.AddOnceListener((_, _) => client.Connect(server, port));
 
         DrawManager drawManager = universe.InstantiateUniverseObject().SetUniverseObject("Draw Manager").BehaviourController.AddBehaviour<DrawManager>();
         universe.InstantiateUniverseObject().SetUniverseObject("Triangle Batcher", drawManager.UniverseObject).BehaviourController.AddBehaviour<TriangleBatcher>();
@@ -49,7 +49,7 @@ public static class PongUniverse
     {
         LiteNetLibServer server = universe.InstantiateUniverseObject().SetUniverseObject("Server").BehaviourController.AddBehaviour<LiteNetLibServer>();
         server.BehaviourController.AddBehaviour<NetworkManager>();
-        server.Start(port, 2);
+        universe.OnPreUpdate.AddOnceListener((_, _) => server.Start(port, 2));
 
         return universe;
     }