diff --git a/TODO.md b/TODO.md
index c5599109b..b72abe10c 100644
--- a/TODO.md
+++ b/TODO.md
@@ -7,7 +7,10 @@ Items to complete before the first alpha release.
 * if the phone doesn't read fromradio mailbox within X seconds, assume the phone is gone and we can stop queing location msgs 
 for it (because it will redownload the nodedb when it comes back)
 
-* have CustomRF95::canSleep say no if we are busy receiving a message
+* lower wait_bluetooth_secs to 30 seconds once we have the GPS power on (but GPS in sleep mode) across light sleep.  For the time
+being I have it set at 2 minutes to ensure enough time for a GPS lock from scratch.
+
+F95::canSleep say no if we are busy receiving a message
 
 * retest BLE software update for both board types
 * send note about Adafruit Clue
diff --git a/src/NodeDB.cpp b/src/NodeDB.cpp
index fd3e28daa..96d8bf5ca 100644
--- a/src/NodeDB.cpp
+++ b/src/NodeDB.cpp
@@ -52,7 +52,7 @@ void NodeDB::init()
 
     radioConfig.preferences.send_owner_interval = 4; // per sw-design.md
     radioConfig.preferences.position_broadcast_secs = 15 * 60;
-    radioConfig.preferences.wait_bluetooth_secs = 30;
+    radioConfig.preferences.wait_bluetooth_secs = 120;
     radioConfig.preferences.screen_on_secs = 30;
     radioConfig.preferences.mesh_sds_timeout_secs = 60 * 60;
     radioConfig.preferences.phone_sds_timeout_sec = 60 * 60;