diff --git a/scripts/client/event.js b/scripts/client/event.js
index 0f3174b0..90875da8 100644
--- a/scripts/client/event.js
+++ b/scripts/client/event.js
@@ -59,8 +59,13 @@ function addAllEventHandlers() {
 
 function onResourceStart(event, resource) {
 	sendResourceStartedSignalToServer();
-	setUpInitialGame();
-	garbageCollectorInterval = setInterval(collectAllGarbage, 1000*60);
+	//setUpInitialGame();
+	//garbageCollectorInterval = setInterval(collectAllGarbage, 1000*60);
+
+	resourceStarted = true;
+	if(resourceReady == true) {
+		initClient();
+	}
 }
 
 // ===========================================================================
@@ -73,6 +78,10 @@ function onResourceStop(event, resource) {
 
 function onResourceReady(event, resource) {
 	sendResourceReadySignalToServer();
+	resourceReady = true;
+	if(resourceStarted == true) {
+		initClient();
+	}
 }
 
 // ===========================================================================