diff --git a/src/cli/src/common/store.rs b/src/cli/src/common/store.rs
index e974037ea4d..c3b8e477ed1 100644
--- a/src/cli/src/common/store.rs
+++ b/src/cli/src/common/store.rs
@@ -86,7 +86,13 @@ pub struct StoreConfig {
 
     /// Automatically create PostgreSQL schema if it doesn't exist (default: true).
     #[cfg(feature = "pg_kvbackend")]
-    #[clap(long, default_value_t = true)]
+    #[clap(
+        long,
+        default_value_t = true,
+        default_missing_value = "true",
+        num_args = 0..=1,
+        action = clap::ArgAction::Set
+    )]
     pub auto_create_schema: bool,
 
     /// TLS mode for backend store connections (etcd, PostgreSQL, MySQL)
@@ -223,3 +229,27 @@ impl StoreConfig {
         }
     }
 }
+
+#[cfg(all(test, feature = "pg_kvbackend"))]
+mod tests {
+    use clap::Parser;
+
+    use super::StoreConfig;
+
+    #[test]
+    fn test_auto_create_schema_accepts_explicit_value() {
+        let config =
+            StoreConfig::try_parse_from(["store", "--auto-create-schema", "false"]).unwrap();
+        assert!(!config.auto_create_schema);
+
+        let config =
+            StoreConfig::try_parse_from(["store", "--auto-create-schema", "true"]).unwrap();
+        assert!(config.auto_create_schema);
+    }
+
+    #[test]
+    fn test_auto_create_schema_defaults_to_true() {
+        let config = StoreConfig::try_parse_from(["store"]).unwrap();
+        assert!(config.auto_create_schema);
+    }
+}