diff --git a/frontend/src/app/main/exports.cljs b/frontend/src/app/main/exports.cljs
index 0370f0b1d4..487541976e 100644
--- a/frontend/src/app/main/exports.cljs
+++ b/frontend/src/app/main/exports.cljs
@@ -295,19 +295,20 @@
   (let [data (obj/get props "data")
         children (obj/get props "children")
         embed? (obj/get props "embed?")
-        include-metadata? (mf/use-ctx use/include-metadata-ctx)]
+        include-metadata? (obj/get props "include-metadata?")]
     [:& (mf/provider embed/context) {:value embed?}
-     [:svg {:version "1.1"
-            :xmlns "http://www.w3.org/2000/svg"
-            :xmlnsXlink "http://www.w3.org/1999/xlink"
-            :xmlns:penpot (when include-metadata? "https://penpot.app/xmlns")
-            :style {:width "100vw"
-                    :height "100vh"
-                    :display (when-not (some? children) "none")}}
-      [:defs
-       (for [[component-id component-data] (:components data)]
-         [:& component-symbol {:id component-id
-                               :key (str component-id)
-                               :data component-data}])]
+     [:& (mf/provider use/include-metadata-ctx) {:value include-metadata?}
+      [:svg {:version "1.1"
+             :xmlns "http://www.w3.org/2000/svg"
+             :xmlnsXlink "http://www.w3.org/1999/xlink"
+             :xmlns:penpot (when include-metadata? "https://penpot.app/xmlns")
+             :style {:width "100vw"
+                     :height "100vh"
+                     :display (when-not (some? children) "none")}}
+       [:defs
+        (for [[component-id component-data] (:components data)]
+          [:& component-symbol {:id component-id
+                                :key (str component-id)
+                                :data component-data}])]
 
-      children]]))
+       children]]]))
diff --git a/frontend/src/app/main/render.cljs b/frontend/src/app/main/render.cljs
index 2f46409fe9..ffe3452d04 100644
--- a/frontend/src/app/main/render.cljs
+++ b/frontend/src/app/main/render.cljs
@@ -82,5 +82,5 @@
      (->> (rx/of data)
           (rx/map
            (fn [data]
-             (let [elem (mf/element exports/components-sprite-svg #js {:data data :embed? true})]
+             (let [elem (mf/element exports/components-sprite-svg #js {:data data :embed? true :include-metadata? true})]
                (rds/renderToStaticMarkup elem))))))))
diff --git a/frontend/src/app/worker/import.cljs b/frontend/src/app/worker/import.cljs
index d318f9d6a9..5891d4ea47 100644
--- a/frontend/src/app/worker/import.cljs
+++ b/frontend/src/app/worker/import.cljs
@@ -358,7 +358,7 @@
     (let [resolve (:resolve context)]
       (->> (get-file context :media-list)
            (rx/flat-map (comp d/kebab-keys cip/string->uuid))
-           (rx/flat-map
+           (rx/mapcat
             (fn [[id media]]
               (let [media (assoc media :id (resolve id))]
                 (->> (get-file context :media id media)