diff --git a/src/client.js b/src/client.js
index 6e5ac22b..6f08c010 100644
--- a/src/client.js
+++ b/src/client.js
@@ -52,6 +52,10 @@ persistStore(store, {}, () => {
   store.dispatch(fetchMe());
 
   socketClient.initialize(store, pixelTransferController, getRenderer);
+
+  // for debugging
+  window.ppStore = store;
+  window.ppRender = getRenderer;
 });
 
 (function load() {
diff --git a/src/core/draw.js b/src/core/draw.js
index 71d7bbe4..ae7d843d 100644
--- a/src/core/draw.js
+++ b/src/core/draw.js
@@ -160,8 +160,7 @@ export default async function drawByOffsets(
       }
 
       /* dont rank antarctica */
-      // eslint-disable-next-line eqeqeq
-      if (canvasId == 0 && y > 14450) {
+      if (canvasId === 0 && y > 14450) {
         ranked = false;
       }
     }
diff --git a/src/socket/SocketServer.js b/src/socket/SocketServer.js
index 7dd1f63a..1e1994fa 100644
--- a/src/socket/SocketServer.js
+++ b/src/socket/SocketServer.js
@@ -363,8 +363,7 @@ class SocketServer {
   broadcastPixelBuffer(canvasId, chunkid, data) {
     if (this.CHUNK_CLIENTS.has(chunkid)) {
       const clients = this.CHUNK_CLIENTS.get(chunkid)
-        // eslint-disable-next-line eqeqeq
-        .filter((ws) => ws.canvasId == canvasId);
+        .filter((ws) => ws.canvasId === canvasId);
       SocketServer.broadcastSelected(clients, data);
     }
   }
@@ -408,9 +407,9 @@ class SocketServer {
       while (!client.done) {
         const ws = client.value;
         if (ws.readyState === WebSocket.OPEN
-          && ws.user
+          && ws.user && ws.canvasId !== null
         ) {
-          const canvasId = ws.canvasId || 0;
+          const { canvasId } = ws;
           const { ip } = ws.user;
           // only count unique IPs per canvas
           if (!ipsPerCanvas[canvasId]) {
@@ -580,7 +579,7 @@ class SocketServer {
         case REG_CANVAS_OP: {
           const canvasId = hydrateRegCanvas(buffer);
           if (!canvases[canvasId]) return;
-          if (ws.canvasId !== null && ws.canvasId !== canvasId) {
+          if (ws.canvasId !== canvasId) {
             this.deleteAllChunks(ws);
           }
           ws.canvasId = canvasId;
diff --git a/src/ui/ChunkLoader.js b/src/ui/ChunkLoader.js
index 53ee3a88..53559707 100644
--- a/src/ui/ChunkLoader.js
+++ b/src/ui/ChunkLoader.js
@@ -122,7 +122,9 @@ class ChunkLoader {
         }
       }
     });
-    this.bcRemoveChunks(remChunks);
+    if (remChunks.length) {
+      this.bcRemoveChunks(remChunks);
+    }
     // eslint-disable-next-line no-console,max-len
     console.log(`GC cleaned ${remChunks.length} / ${chunks.size + remChunks.length} chunks`);
   }