diff --git a/frontend/src/app/main/data/workspace/common.cljs b/frontend/src/app/main/data/workspace/common.cljs
index 7b42338ff5..0cdd800186 100644
--- a/frontend/src/app/main/data/workspace/common.cljs
+++ b/frontend/src/app/main/data/workspace/common.cljs
@@ -532,8 +532,12 @@
             unames   (retrieve-used-names objects)
             name     (generate-unique-name unames (:name shape))
 
-            frame-id (or (:frame-id attrs)
-                         (cph/frame-id-by-position objects attrs))
+
+
+            frame-id (if (= :frame (:type attrs))
+                       uuid/zero
+                       (or (:frame-id attrs)
+                           (cph/frame-id-by-position objects attrs)))
 
             shape    (merge
                       (if (= :frame (:type shape))
diff --git a/frontend/src/app/main/ui/viewer/shapes.cljs b/frontend/src/app/main/ui/viewer/shapes.cljs
index 9ec1931e2d..84a45ba976 100644
--- a/frontend/src/app/main/ui/viewer/shapes.cljs
+++ b/frontend/src/app/main/ui/viewer/shapes.cljs
@@ -154,6 +154,7 @@
                           (geom/translate-to-frame frame))
                 opts #js {:shape shape}]
             (case (:type shape)
+              :frame  [:g.empty]
               :text   [:> text-wrapper opts]
               :rect   [:> rect-wrapper opts]
               :path   [:> path-wrapper opts]