diff --git a/common/app/common/spec.cljc b/common/app/common/spec.cljc
index 45b1be6a6d..b37bb45685 100644
--- a/common/app/common/spec.cljc
+++ b/common/app/common/spec.cljc
@@ -123,13 +123,14 @@
 
 (s/def ::safe-integer
   #(and
-    (integer? %)
+    (int? %)
     (>= % min-safe-int)
     (<= % max-safe-int)))
 
 (s/def ::safe-number
   #(and
-    (number? %)
+    (or (int? %)
+        (float? %))
     (>= % min-safe-int)
     (<= % max-safe-int)))