diff --git a/common/src/app/common/files/migrations.cljc b/common/src/app/common/files/migrations.cljc
index 47426305f..1c08ad474 100644
--- a/common/src/app/common/files/migrations.cljc
+++ b/common/src/app/common/files/migrations.cljc
@@ -848,9 +848,6 @@
         (update :pages-index update-vals update-container)
         (update :components update-vals update-container))))
 
-(def ^:private valid-shadow?
-  (sm/lazy-validator ::ctss/shadow))
-
 (defmethod migrate-data "legacy-44"
   [data _]
   (letfn [(fix-shadow [shadow]
@@ -862,7 +859,7 @@
 
           (update-object [object]
             (let [xform (comp (map fix-shadow)
-                              (filter valid-shadow?))]
+                              (filter ctss/valid-shadow?))]
               (d/update-when object :shadow #(into [] xform %))))
 
           (update-container [container]
@@ -1037,7 +1034,7 @@
 
           (update-shape [shape]
             (let [xform (comp (map fix-shadow)
-                              (filter valid-shadow?))]
+                              (filter ctss/valid-shadow?))]
               (d/update-when shape :shadow #(into [] xform %))))
 
           (update-container [container]
diff --git a/common/src/app/common/types/shape.cljc b/common/src/app/common/types/shape.cljc
index 5033965db..fc70ff61e 100644
--- a/common/src/app/common/types/shape.cljc
+++ b/common/src/app/common/types/shape.cljc
@@ -211,7 +211,7 @@
    [:interactions {:optional true}
     [:vector {:gen/max 2} ::ctsi/interaction]]
    [:shadow {:optional true}
-    [:vector {:gen/max 1} ::ctss/shadow]]
+    [:vector {:gen/max 1} ctss/schema:shadow]]
    [:blur {:optional true} ::ctsb/blur]
    [:grow-type {:optional true}
     [::sm/one-of grow-types]]
diff --git a/common/src/app/common/types/shape/shadow.cljc b/common/src/app/common/types/shape/shadow.cljc
index 1b37dd3e9..c00a1ce82 100644
--- a/common/src/app/common/types/shape/shadow.cljc
+++ b/common/src/app/common/types/shape/shadow.cljc
@@ -26,7 +26,9 @@
    [:hidden :boolean]
    [:color ::ctc/color]])
 
-(sm/register! ::shadow schema:shadow)
-
 (def check-shadow
   (sm/check-fn schema:shadow))
+
+(def valid-shadow?
+  (sm/validator schema:shadow))
+
diff --git a/frontend/src/app/plugins/shape.cljs b/frontend/src/app/plugins/shape.cljs
index 5b1fe0467..f05981d1d 100644
--- a/frontend/src/app/plugins/shape.cljs
+++ b/frontend/src/app/plugins/shape.cljs
@@ -432,7 +432,7 @@
               (let [id (obj/get self "$id")
                     value (mapv #(shadow-defaults (parser/parse-shadow %)) value)]
                 (cond
-                  (not (sm/validate [:vector ::ctss/shadow] value))
+                  (not (sm/validate [:vector ctss/schema:shadow] value))
                   (u/display-not-valid :shadows value)
 
                   (not (r/check-permission plugin-id "content:write"))