diff --git a/common/src/app/common/types/path.cljc b/common/src/app/common/types/path.cljc
index 60e736914b..2b1188682f 100644
--- a/common/src/app/common/types/path.cljc
+++ b/common/src/app/common/types/path.cljc
@@ -392,7 +392,9 @@
   ([shape]
    (convert-to-path shape {}))
   ([shape objects]
-   (-> (stp/convert-to-path shape objects)
-       (update :content impl/path-data))))
+   (let [shape' (stp/convert-to-path shape objects)]
+     (if (identical? shape shape')
+       shape'
+       (update shape' :content impl/path-data)))))
 
 (dm/export impl/decode-segments)
diff --git a/common/test/common_tests/types/path_data_test.cljc b/common/test/common_tests/types/path_data_test.cljc
index f56d61a539..714270cb62 100644
--- a/common/test/common_tests/types/path_data_test.cljc
+++ b/common/test/common_tests/types/path_data_test.cljc
@@ -1370,6 +1370,15 @@
     ;; A path shape stays a path shape unchanged
     (t/is (= :path (:type result)))))
 
+(t/deftest shape-to-path-svg-raw-does-not-throw
+  (let [shape  {:type :svg-raw :x 0.0 :y 0.0 :width 100.0 :height 50.0
+                :selrect (make-selrect 0.0 0.0 100.0 50.0)
+                :content {:tag :text :attrs {:style {}}
+                          :content [{:tag :tspan :attrs {} :content ["x"]}]}}
+        result (path/convert-to-path shape {})]
+    (t/is (= :svg-raw (:type result)))
+    (t/is (some? (:content result)))))
+
 (t/deftest shape-to-path-rect-with-radius
   (let [shape  {:type :rect :x 0.0 :y 0.0 :width 100.0 :height 100.0
                 :r1 10.0 :r2 10.0 :r3 10.0 :r4 10.0