diff --git a/src/controls/VoxelPainterControls.js b/src/controls/VoxelPainterControls.js
index f68387ed..fcf93d91 100644
--- a/src/controls/VoxelPainterControls.js
+++ b/src/controls/VoxelPainterControls.js
@@ -91,8 +91,6 @@ class VoxelPainterControls {
   renderer;
   domElement;
   state;
-  // Set to false to disable this control
-  enabled = true;
   // "target" sets the location of focus, where the object orbits around
   target;
   // for reset
@@ -437,9 +435,6 @@ class VoxelPainterControls {
   //
   //
   onDocumentKeyDown(event) {
-    if (!this.enabled) {
-      return;
-    }
     // ignore key presses if modal is open or chat is used
     if (event.target.nodeName === 'INPUT'
       || event.target.nodeName === 'TEXTAREA'
@@ -476,9 +471,6 @@ class VoxelPainterControls {
   }
 
   onDocumentKeyUp(event) {
-    if (!this.enabled) {
-      return;
-    }
     // ignore key presses if modal is open or chat is used
     if (event.target.nodeName === 'INPUT'
       || event.target.nodeName === 'TEXTAREA'
@@ -516,10 +508,6 @@ class VoxelPainterControls {
 
 
   onMouseMove(event) {
-    if (!this.enabled) {
-      return;
-    }
-
     event.preventDefault();
 
     switch (this.state) {
@@ -538,10 +526,6 @@ class VoxelPainterControls {
   }
 
   onMouseUp(event) {
-    if (!this.enabled) {
-      return;
-    }
-
     this.handleMouseUp(event);
     document.removeEventListener('mousemove', this.onMouseMove, false);
     document.removeEventListener('mouseup', this.onMouseUp, false);
@@ -549,8 +533,7 @@ class VoxelPainterControls {
   }
 
   onMouseWheel(event) {
-    if (!this.enabled
-      || !enableZoom
+    if (!enableZoom
       || (this.state !== STATE.NONE
         && this.state !== STATE.ROTATE)
     ) {
@@ -564,10 +547,6 @@ class VoxelPainterControls {
   }
 
   onTouchStart(event) {
-    if (!this.enabled) {
-      return;
-    }
-
     event.preventDefault();
 
     switch (event.touches.length) {
@@ -617,10 +596,6 @@ class VoxelPainterControls {
   }
 
   onTouchMove(event) {
-    if (!this.enabled) {
-      return;
-    }
-
     event.preventDefault();
     event.stopPropagation();
 
@@ -659,27 +634,15 @@ class VoxelPainterControls {
   }
 
   onTouchEnd(event) {
-    if (!this.enabled) {
-      return;
-    }
-
     this.handleTouchEnd(event);
     this.state = STATE.NONE;
   }
 
   onContextMenu(event) {
-    if (!this.enabled) {
-      return;
-    }
-
     event.preventDefault();
   }
 
   onMouseDown(event) {
-    if (!this.enabled) {
-      return;
-    }
-
     // Prevent the browser from scrolling.
     event.preventDefault();
 
diff --git a/src/ui/Renderer3D.js b/src/ui/Renderer3D.js
index eb95ee41..e7c61ee6 100644
--- a/src/ui/Renderer3D.js
+++ b/src/ui/Renderer3D.js
@@ -520,13 +520,15 @@ class Renderer3D extends Renderer {
   multiTapEnd() {
     const {
       store,
-      mouseMoveStart,
       multitap,
     } = this;
     this.multitap = 0;
     const state = store.getState();
 
-    const [px, py, pz] = mouseMoveStart;
+    if (!this.mouseMoveStart || !state.canvas.hover) {
+      return;
+    }
+    const [px, py, pz] = this.mouseMoveStart;
     const [qx, qy, qz] = state.canvas.hover;
     if (px !== qx || py !== qy || pz !== qz) {
       return;
@@ -614,10 +616,10 @@ class Renderer3D extends Renderer {
       return;
     }
 
-    const [px, py, pz] = this.mouseMoveStart;
-    if (!state.canvas.hover) {
+    if (!this.mouseMoveStart || !state.canvas.hover) {
       return;
     }
+    const [px, py, pz] = this.mouseMoveStart;
     const [qx, qy, qz] = state.canvas.hover;
     if (px !== qx || py !== qy || pz !== qz) {
       return;