diff --git a/frontend/src/app/main/ui/workspace/tokens/components/controls/input_tokens_value.cljs b/frontend/src/app/main/ui/workspace/tokens/components/controls/input_tokens_value.cljs
index aec102c30..62f6b7f1e 100644
--- a/frontend/src/app/main/ui/workspace/tokens/components/controls/input_tokens_value.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/components/controls/input_tokens_value.cljs
@@ -7,7 +7,6 @@
 (ns app.main.ui.workspace.tokens.components.controls.input-tokens-value
   (:require-macros [app.main.style :as stl])
   (:require
-   [app.common.data :as d]
    [app.common.data.macros :as dm]
    [app.main.ui.ds.controls.utilities.input-field :refer [input-field*]]
    [app.main.ui.ds.controls.utilities.label :refer [label*]]
@@ -43,7 +42,7 @@
                                       :type "text"
                                       :class (stl/css :input)
                                       :placeholder placeholder
-                                      :value (d/nilv value "")
+                                      :value value
                                       :variant "comfortable"
                                       :hint-type (when error "error")
                                       :slot-start swatch
diff --git a/frontend/src/app/main/ui/workspace/tokens/form.cljs b/frontend/src/app/main/ui/workspace/tokens/form.cljs
index 783f13625..60fe6f01f 100644
--- a/frontend/src/app/main/ui/workspace/tokens/form.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/form.cljs
@@ -560,7 +560,7 @@
        [:> input-tokens-value*
         {:placeholder (tr "workspace.token.token-value-enter")
          :label (tr "workspace.token.token-value")
-         :value (mf/ref-val value-ref)
+         :default-value (mf/ref-val value-ref)
          :ref value-input-ref
          :color color
          :on-change on-update-value