diff --git a/frontend/src/uxbox/main/exports.cljs b/frontend/src/uxbox/main/exports.cljs
index 57161ab74..64f99e0db 100644
--- a/frontend/src/uxbox/main/exports.cljs
+++ b/frontend/src/uxbox/main/exports.cljs
@@ -44,7 +44,7 @@
 
 (mx/defc shape-component
   [sid]
-  (let [shape (get-in @*state* [:shapes sid])]
+  (when-let [shape (get-in @*state* [:shapes sid])]
     (shape-wrapper shape)))
 
 (mx/defc page-svg