diff --git a/client/client.js b/client/client.js
index e570a9a7..be1f9c9f 100644
--- a/client/client.js
+++ b/client/client.js
@@ -28,7 +28,9 @@ class Socket {
 			this.on(i, this._handlers[i].bind(this));
 		}
 
-		this._simulateEvent("loadStart");
+		setTimeout(() => {
+			this._simulateEvent("loadStart");
+		}, 0);
 		let firstConnectHandler = () => {
 			this.removeListener("connect", firstConnectHandler);
 			this._simulateEvent("loadEnd");
diff --git a/frontend/app/map/map/map.js b/frontend/app/map/map/map.js
index e1a2cde7..7b76ea07 100644
--- a/frontend/app/map/map/map.js
+++ b/frontend/app/map/map/map.js
@@ -311,11 +311,11 @@ fm.app.factory("fmMap", function(fmUtils, fmSocket, fmMapMessages, fmMapMarkers,
 			map.socket.loading--;
 		};
 
-		map.socket.$on("loadStart", function() {
+		map.socket.on("loadStart", function() {
 			map.loadStart();
 		});
 
-		map.socket.$on("loadEnd", function() {
+		map.socket.on("loadEnd", function() {
 			map.loadEnd();
 		});