diff --git a/src/canvas/index.js b/src/canvas/index.js
index 12d1a10a9..9f28202d5 100644
--- a/src/canvas/index.js
+++ b/src/canvas/index.js
@@ -1,4 +1,4 @@
-import { on, off } from 'utils/mixins';
+import { on, off, hasDnd } from 'utils/mixins';
 import Droppable from 'utils/Droppable';
 
 module.exports = () => {
@@ -395,7 +395,7 @@ module.exports = () => {
     },
 
     postRender() {
-      this.droppable = new Droppable(c.em);
+      if (hasDnd(c.em)) this.droppable = new Droppable(c.em);
     },
 
     /**
diff --git a/src/commands/index.js b/src/commands/index.js
index 5c5199492..219d7cb86 100644
--- a/src/commands/index.js
+++ b/src/commands/index.js
@@ -190,7 +190,6 @@ module.exports = () => {
               }
             });
           } else {
-            console.log(em.get('Config'));
             if (event.type == 'dragstart') {
               event.dataTransfer.setDragImage(sel.view.el, 0, 0);
               //sel.set('status', 'freezed');
diff --git a/src/dom_components/model/Component.js b/src/dom_components/model/Component.js
index 17f6c78d4..2e5fb596a 100644
--- a/src/dom_components/model/Component.js
+++ b/src/dom_components/model/Component.js
@@ -7,7 +7,7 @@ import {
   isString,
   keys
 } from 'underscore';
-import { shallowDiff } from 'utils/mixins';
+import { shallowDiff, hasDnd } from 'utils/mixins';
 import Styleable from 'domain_abstract/model/Styleable';
 
 const Backbone = require('backbone');
@@ -498,7 +498,7 @@ const Component = Backbone.Model.extend(Styleable).extend(
         if (model.get('draggable')) {
           tb.push({
             attributes: { class: 'fa fa-arrows', draggable: true },
-            events: { dragstart: 'execCommand' },
+            events: hasDnd(this.em) ? { dragstart: 'execCommand' } : '',
             command: 'tlb-move'
           });
         }