diff --git a/packages/metal-drag-drop/src/Drag.js b/packages/metal-drag-drop/src/Drag.js
index faaf929ef..d01791c2e 100644
--- a/packages/metal-drag-drop/src/Drag.js
+++ b/packages/metal-drag-drop/src/Drag.js
@@ -264,7 +264,9 @@ class Drag extends State {
 		this.mousePos_ = null;
 		this.mouseSourceDelta_ = null;
 		this.dragging_ = false;
-		this.dragHandler_.removeAllListeners();
+		if (this.dragHandler_) {
+			this.dragHandler_.removeAllListeners();
+		}
 	}
 
 	/**