diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
index ca680856c..37eb9f2c1 100644
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -189,10 +189,10 @@ bool NodeDB::resetRadioConfig(bool factory_reset)
         rebootAtMsec = millis() + (5 * 1000);
     }
 
-#if defined(T_DECK) && defined(HAS_TFT)
+#if (defined(T_DECK) || defined(T_WATCH_S3) || defined(UNPHONE) || defined(PICOMPUTER_S3)) && defined(HAS_TFT)
     config.bluetooth.enabled = false;
     if (moduleConfig.external_notification.nag_timeout == 60)
-        moduleConfig.external_notification.nag_timeout = 3;
+        moduleConfig.external_notification.nag_timeout = 0;
 #endif
 
     return didFactoryReset;