diff --git a/src/main/cli/settings.c b/src/main/cli/settings.c
index 9947ba306..14494340a 100644
--- a/src/main/cli/settings.c
+++ b/src/main/cli/settings.c
@@ -772,8 +772,8 @@ const clivalue_t valueTable[] = {
     { "dshot_bidir",            VAR_UINT8  | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_MOTOR_CONFIG, offsetof(motorConfig_t, dev.useDshotTelemetry) },
 #endif
 #ifdef USE_DSHOT_BITBANG
-    { "dshot_bitbang",               VAR_UINT8  | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON_AUTO }, PG_MOTOR_CONFIG, offsetof(motorConfig_t, dev.useDshotBitbang) },
-    { "dshot_bitbang_timer",         VAR_UINT8  | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_DSHOT_BITBANGED_TIMER }, PG_MOTOR_CONFIG, offsetof(motorConfig_t, dev.useDshotBitbangedTimer) },
+    { "dshot_bitbang",               VAR_UINT8  | HARDWARE_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON_AUTO }, PG_MOTOR_CONFIG, offsetof(motorConfig_t, dev.useDshotBitbang) },
+    { "dshot_bitbang_timer",         VAR_UINT8  | HARDWARE_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_DSHOT_BITBANGED_TIMER }, PG_MOTOR_CONFIG, offsetof(motorConfig_t, dev.useDshotBitbangedTimer) },
 #endif
 #endif
     { "use_unsynced_pwm",           VAR_UINT8  | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_MOTOR_CONFIG, offsetof(motorConfig_t, dev.useUnsyncedPwm) },
diff --git a/src/main/pg/motor.c b/src/main/pg/motor.c
index 7c219b18e..85968097e 100644
--- a/src/main/pg/motor.c
+++ b/src/main/pg/motor.c
@@ -75,8 +75,8 @@ void pgResetFn_motorConfig(motorConfig_t *motorConfig)
     motorConfig->motorPoleCount = 14;   // Most brushes motors that we use are 14 poles
 
 #ifdef USE_DSHOT_BITBANG
-    motorConfig->dev.useDshotBitbang = DSHOT_BITBANG_AUTO;
-    motorConfig->dev.useDshotBitbangedTimer = DSHOT_BITBANGED_TIMER_AUTO;
+    motorConfig->dev.useDshotBitbang = DSHOT_BITBANG_DEFAULT;
+    motorConfig->dev.useDshotBitbangedTimer = DSHOT_BITBANGED_TIMER_DEFAULT;
 #endif
 }
 
diff --git a/src/main/target/common_defaults_post.h b/src/main/target/common_defaults_post.h
index 9033c7860..361c0bbc2 100644
--- a/src/main/target/common_defaults_post.h
+++ b/src/main/target/common_defaults_post.h
@@ -661,3 +661,13 @@
 #endif
 #define MAX_SUPPORTED_SERVOS 8
 #endif
+
+#if defined(USE_DSHOT_BITBANG)
+#if !defined(DSHOT_BITBANG_DEFAULT)
+#define DSHOT_BITBANG_DEFAULT DSHOT_BITBANG_AUTO
+#endif
+
+#if !defined(DSHOT_BITBANGED_TIMER_DEFAULT)
+#define DSHOT_BITBANGED_TIMER_DEFAULT DSHOT_BITBANGED_TIMER_AUTO
+#endif
+#endif // USE_DSHOT_BITBANG