diff --git a/html/app.js b/html/app.js
index dd634818..ad38bcef 100644
--- a/html/app.js
+++ b/html/app.js
@@ -5574,7 +5574,8 @@ CefSharp.BindObjectAsync(
 				}
 			}
 		}
-		if (this.lastLocation === L.tag) {
+		if (this.isGameRunning &&
+			this.lastLocation === L.tag) {
 			users.push(this.API.currentUser);
 		}
 		users.sort(compareByDisplayName);
@@ -5991,18 +5992,20 @@ CefSharp.BindObjectAsync(
 			}
 			instance.users.push(ref);
 		}
-		var lastLocation$ = API.parseLocation(this.lastLocation);
-		if (lastLocation$.worldId === D.id) {
-			var instance = instances[lastLocation$.instanceId];
-			if (instance === undefined) {
-				instance = {
-					id: lastLocation$.instanceId,
-					occupants: 1,
-					users: []
-				};
-				instances[instance.id] = instance;
+		if (this.isGameRunning) {
+			var lastLocation$ = API.parseLocation(this.lastLocation);
+			if (lastLocation$.worldId === D.id) {
+				var instance = instances[lastLocation$.instanceId];
+				if (instance === undefined) {
+					instance = {
+						id: lastLocation$.instanceId,
+						occupants: 1,
+						users: []
+					};
+					instances[instance.id] = instance;
+				}
+				instance.users.push(this.API.currentUser);
 			}
-			instance.users.push(this.API.currentUser);
 		}
 		var rooms = [];
 		for (var instance of Object.values(instances)) {