diff --git a/platformio.ini b/platformio.ini
index c511587a6..2c373ab00 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -79,7 +79,7 @@ lib_deps =
   mathertel/OneButton@^2.5.0 ; OneButton library for non-blocking button debounce
   https://github.com/meshtastic/arduino-fsm.git#7db3702bf0cfe97b783d6c72595e3f38e0b19159
   https://github.com/meshtastic/TinyGPSPlus.git#f9f4fef2183514aa52be91d714c1455dd6f26e45
-  https://github.com/meshtastic/ArduinoThread.git#72921ac222eed6f526ba1682023cee290d9aa1b3
+  https://github.com/meshtastic/ArduinoThread.git#1ae8778c85d0a2a729f989e0b1e7d7c4dc84eef0
   nanopb/Nanopb@^0.4.7
   erriez/ErriezCRC32@^1.0.1
 
diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
index 04b6fe89d..25d010f16 100644
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -649,6 +649,7 @@ void NodeDB::saveDeviceStateToDisk()
 #ifdef FSCom
     FSCom.mkdir("/prefs");
 #endif
+    saveProto(prefFileName, meshtastic_DeviceState_size, &meshtastic_DeviceState_msg, &devicestate);
 }
 
 void NodeDB::saveToDisk(int saveWhat)
diff --git a/src/mesh/NodeDB.h b/src/mesh/NodeDB.h
index 930b3483e..1d2086adb 100644
--- a/src/mesh/NodeDB.h
+++ b/src/mesh/NodeDB.h
@@ -213,4 +213,6 @@ extern uint32_t error_address;
 #define Module_Config_size                                                                                                       \
     (ModuleConfig_CannedMessageConfig_size + ModuleConfig_ExternalNotificationConfig_size + ModuleConfig_MQTTConfig_size +       \
      ModuleConfig_RangeTestConfig_size + ModuleConfig_SerialConfig_size + ModuleConfig_StoreForwardConfig_size +                 \
-     ModuleConfig_TelemetryConfig_size + ModuleConfig_size)
\ No newline at end of file
+     ModuleConfig_TelemetryConfig_size + ModuleConfig_size)
+
+// Please do not remove this comment, it makes trunk and compiler happy at the same time.
diff --git a/variants/t-deck/platformio.ini b/variants/t-deck/platformio.ini
index cb6033300..593fdae5e 100644
--- a/variants/t-deck/platformio.ini
+++ b/variants/t-deck/platformio.ini
@@ -8,6 +8,7 @@ upload_protocol = esptool
 build_flags = ${esp32_base.build_flags} 
   -DT_DECK 
   -DBOARD_HAS_PSRAM
+  -DMAX_THREADS=40
   -DGPS_POWER_TOGGLE
   -Ivariants/t-deck