diff --git a/js/ui/dnd.js b/js/ui/dnd.js
index 021cb2eb3..61776da91 100644
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -144,6 +144,8 @@ _Draggable.prototype = {
 
     _ungrabActor: function() {
         Clutter.ungrab_pointer();
+        if (!this._onEventId)
+            return;
         this.actor.disconnect(this._onEventId);
         this._onEventId = null;
     },