diff --git a/frontend/src/app/main/ui/workspace/tokens/form.cljs b/frontend/src/app/main/ui/workspace/tokens/form.cljs
index 13ecb49237..de24713031 100644
--- a/frontend/src/app/main/ui/workspace/tokens/form.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/form.cljs
@@ -398,8 +398,9 @@ Token names should only contain letters and digits separated by . characters.")}
          :external-ref value-input-ref
          :on-change on-update-value
          :on-blur on-update-value}
-        [:> input-token-color-bullet*
-         {:color @color :on-click on-display-colorpicker}]]
+        (when color?
+          [:> input-token-color-bullet*
+           {:color @color :on-click on-display-colorpicker}])]
 
        (when @color-ramp-open?
          [:& ramp {:color (some-> (or @token-resolve-result (:value token))