diff --git a/deps/db/bb.edn b/deps/db/bb.edn
index c52f770ca7..000c6db732 100644
--- a/deps/db/bb.edn
+++ b/deps/db/bb.edn
@@ -35,7 +35,7 @@
                    (rules/extract-rules (dissoc rules/db-query-dsl-rules
                                                 :task :priority
                                                 :property :simple-query-property :private-property
-                                                :property-checkbox-default-value
+                                                :property-scalar-default-value
                                                 :property-missing-value
                                                 :has-property-or-default-value)))))}}
 
diff --git a/deps/db/src/logseq/db/frontend/entity_plus.cljc b/deps/db/src/logseq/db/frontend/entity_plus.cljc
index 6271c366f8..ff0fc0d5c8 100644
--- a/deps/db/src/logseq/db/frontend/entity_plus.cljc
+++ b/deps/db/src/logseq/db/frontend/entity_plus.cljc
@@ -52,7 +52,7 @@
          (when-let [property (d/entity db k)]
            (let [schema (lookup-entity property :block/schema nil)]
              (if (= :checkbox (:type schema))
-               (lookup-entity property :logseq.property/checkbox-default-value nil)
+               (lookup-entity property :logseq.property/scalar-default-value nil)
                (lookup-entity property :logseq.property/default-value nil)))))))))
 
 (defn lookup-kv-then-entity
diff --git a/deps/db/src/logseq/db/frontend/property.cljs b/deps/db/src/logseq/db/frontend/property.cljs
index 2b6cc09ca9..492324be3b 100644
--- a/deps/db/src/logseq/db/frontend/property.cljs
+++ b/deps/db/src/logseq/db/frontend/property.cljs
@@ -152,11 +152,11 @@
                                             :public? false
                                             :hide? true
                                             :view-context :property}}
-   :logseq.property/checkbox-default-value {:title "Checkbox default value"
-                                            :schema {:type :checkbox
-                                                     :public? false
-                                                     :hide? true
-                                                     :view-context :property}}
+   :logseq.property/scalar-default-value {:title "Non ref type default value"
+                                          :schema {:type :any
+                                                   :public? false
+                                                   :hide? true
+                                                   :view-context :property}}
    :logseq.property.class/properties {:title "Tag Properties"
                                       :schema {:type :property
                                                :cardinality :many
diff --git a/deps/db/src/logseq/db/frontend/rules.cljc b/deps/db/src/logseq/db/frontend/rules.cljc
index e741199451..006ec8ea45 100644
--- a/deps/db/src/logseq/db/frontend/rules.cljc
+++ b/deps/db/src/logseq/db/frontend/rules.cljc
@@ -180,8 +180,8 @@
       [(= ?prop-v "N/A")]
       [?prop-e ?default-p ?default-v]]
 
-    :property-checkbox-default-value
-    '[(property-checkbox-default-value ?b ?prop-e ?default-p ?val)
+    :property-scalar-default-value
+    '[(property-scalar-default-value ?b ?prop-e ?default-p ?val)
       (property-missing-value ?b ?prop-e ?default-p ?default-v)
       [(missing? $ ?prop-e :db/valueType)]
       [?prop-e ?default-p ?val]]
@@ -201,7 +201,7 @@
        (or
         (and
          [(missing? $ ?prop-e :db/valueType)]
-         (property-checkbox-default-value ?b ?prop-e :logseq.property/checkbox-default-value ?val))
+         (property-scalar-default-value ?b ?prop-e :logseq.property/scalar-default-value ?val))
         (and
          [?prop-e :db/valueType :db.type/ref]
          (property-default-value ?b ?prop-e :logseq.property/default-value ?val)))]]
@@ -219,7 +219,7 @@
        [?b ?prop _]
        (and (object-has-class-property? ?b ?prop)
             (or [?prop-e :logseq.property/default-value _]
-                [?prop-e :logseq.property/checkbox-default-value _])))]
+                [?prop-e :logseq.property/scalar-default-value _])))]
 
     ;; Checks if a property exists for simple queries. Supports default values
     :has-simple-query-property
@@ -316,8 +316,8 @@
    :has-simple-query-property #{:has-property-or-default-value}
    :has-private-simple-query-property #{:has-property-or-default-value}
    :property-default-value #{:existing-property-value :property-missing-value}
-   :property-checkbox-default-value #{:existing-property-value :property-missing-value}
-   :property-value #{:property-default-value :property-checkbox-default-value}
+   :property-scalar-default-value #{:existing-property-value :property-missing-value}
+   :property-value #{:property-default-value :property-scalar-default-value}
    :simple-query-property #{:property-value}
    :private-simple-query-property #{:property-value}})
 
diff --git a/deps/db/test/logseq/db/frontend/rules_test.cljs b/deps/db/test/logseq/db/frontend/rules_test.cljs
index 16aecd244c..35317cb1db 100644
--- a/deps/db/test/logseq/db/frontend/rules_test.cljs
+++ b/deps/db/test/logseq/db/frontend/rules_test.cljs
@@ -15,7 +15,7 @@
                              :property-missing-value
                              :existing-property-value
                              :object-has-class-property}
-        property-value-deps (conj default-value-deps :property-value :property-checkbox-default-value)
+        property-value-deps (conj default-value-deps :property-value :property-scalar-default-value)
         property-deps (conj property-value-deps :simple-query-property)
         task-deps #{:property :task}
         priority-deps #{:property :priority}
diff --git a/src/main/frontend/components/property/config.cljs b/src/main/frontend/components/property/config.cljs
index 119a7adbed..82fb3e2d4d 100644
--- a/src/main/frontend/components/property/config.cljs
+++ b/src/main/frontend/components/property/config.cljs
@@ -522,13 +522,13 @@
   [property]
   (let [property-type (get-in property [:block/schema :type])
         option (if (= :checkbox property-type)
-                 (let [default-value (:logseq.property/checkbox-default-value property)]
+                 (let [default-value (:logseq.property/scalar-default-value property)]
                    {:icon :settings-2
                     :title "Default value"
                     :toggle-checked? (boolean default-value)
                     :checkbox? true
                     :on-toggle-checked-change (fn []
-                                                (db-property-handler/set-block-property! (:block/uuid property) :logseq.property/checkbox-default-value (not default-value)))})
+                                                (db-property-handler/set-block-property! (:block/uuid property) :logseq.property/scalar-default-value (not default-value)))})
                  (let [default-value (:logseq.property/default-value property)]
                    {:icon :settings-2 :title "Default value"
                     :desc (if default-value (db-property/property-value-content default-value) "Set value")
diff --git a/src/main/frontend/components/property/value.cljs b/src/main/frontend/components/property/value.cljs
index 6ec8ec1a12..da6f9e9118 100644
--- a/src/main/frontend/components/property/value.cljs
+++ b/src/main/frontend/components/property/value.cljs
@@ -160,8 +160,8 @@
   "If a class and in a class schema context, add the property to its schema.
   Otherwise, add a block's property and its value"
   ([block property-key property-value] (<add-property! block property-key property-value {}))
-  ([block property-id property-value' {:keys [exit-edit? class-schema?]
-                                       :or {exit-edit? true}}]
+  ([block property-id property-value {:keys [exit-edit? class-schema?]
+                                      :or {exit-edit? true}}]
    (let [repo (state/get-current-repo)
          class? (ldb/class? block)
          property (db/entity property-id)
@@ -174,12 +174,15 @@
         (db-property-handler/class-add-property! (:db/id block) property-id)
         (let [block-ids (map :block/uuid blocks)]
           (if (and (db-property-type/all-ref-property-types (get-in property [:block/schema :type]))
-                   (string? property-value'))
-            (p/let [new-block (<create-new-block! block (db/entity property-id) property-value' {:edit-block? false})]
+                   (string? property-value))
+            (p/let [new-block (<create-new-block! block (db/entity property-id) property-value {:edit-block? false})]
               (when (seq (remove #{(:db/id block)} (map :db/id block)))
                 (property-handler/batch-set-block-property! repo block-ids property-id (:db/id new-block)))
               new-block)
-            (property-handler/batch-set-block-property! repo block-ids property-id property-value'))))
+            (let [value (if-some [value (:logseq.property/scalar-default-value property)]
+                          value
+                          property-value)]
+              (property-handler/batch-set-block-property! repo block-ids property-id value)))))
       (when exit-edit?
         (ui/hide-popups-until-preview-popup!)
         (shui/dialog-close!))
diff --git a/src/main/frontend/worker/db/migrate.cljs b/src/main/frontend/worker/db/migrate.cljs
index e031e2a594..fc1a0b3ec9 100644
--- a/src/main/frontend/worker/db/migrate.cljs
+++ b/src/main/frontend/worker/db/migrate.cljs
@@ -461,7 +461,7 @@
                      :block/created-at :block/updated-at
                      :logseq.property.attribute/property-schema-classes :logseq.property.attribute/property-value-content]}]
    [47 {:fix replace-hidden-type-with-schema}]
-   [48 {:properties [:logseq.property/default-value :logseq.property/checkbox-default-value]}]])
+   [48 {:properties [:logseq.property/default-value :logseq.property/scalar-default-value]}]])
 
 (let [max-schema-version (apply max (map first schema-version->updates))]
   (assert (<= db-schema/version max-schema-version))
diff --git a/src/test/frontend/db/query_dsl_test.cljs b/src/test/frontend/db/query_dsl_test.cljs
index 058c9ce0c9..861418413e 100644
--- a/src/test/frontend/db/query_dsl_test.cljs
+++ b/src/test/frontend/db/query_dsl_test.cljs
@@ -237,7 +237,7 @@ prop-d:: [[nada]]"}])
      {:properties
       {:checkbox {:block/schema {:type :checkbox}
                   :build/properties
-                  {:logseq.property/checkbox-default-value true}}}
+                  {:logseq.property/scalar-default-value true}}}
       :classes {:Class1 {:build/schema-properties [:checkbox]}}
       :pages-and-blocks
       [{:page {:block/title "page1"}