diff --git a/src/uxbox/ui/workspace/drawarea.cljs b/src/uxbox/ui/workspace/drawarea.cljs
index 9ae719a8d..75f0da1fa 100644
--- a/src/uxbox/ui/workspace/drawarea.cljs
+++ b/src/uxbox/ui/workspace/drawarea.cljs
@@ -36,7 +36,7 @@
   [own]
   (let [shape (rum/react drawing-shape)
         position (rum/react drawing-position)]
-    (when shape
+    (when (and shape position)
       (-> (assoc shape :drawing? true)
           (geom/resize position)
           (uusc/render-shape identity)))))