diff --git a/TODO.txt b/TODO.txt
index 8f8b0f0a9..ad1ba531d 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -21,7 +21,8 @@ NEXT:
   - DONE: stop all baseband connections on HCI_POWER_OFF
   - DONE: handle HCI_POWER_ON and HCI_POWER_OFF in existing 4 states
   - DONE: store data of remote db on every change
-  - don't stop BTdaemon on power down/client disconnect
+  - DONE: don't stop BTdaemon on power down/client disconnect
+  - handle transition for HCI_POWER_SLEEP and all HCI state transitions
   - decide on configure flags
   - clean up components
 
diff --git a/src/daemon.c b/src/daemon.c
index fd0c0252d..722310477 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -212,17 +212,8 @@ static void dummy_bluetooth_status_handler(BLUETOOTH_STATE state){
 static void (*bluetooth_status_handler)(BLUETOOTH_STATE state) = dummy_bluetooth_status_handler;
 
 static void daemon_no_connections_timeout(){
-#if 1  
-#ifdef USE_LAUNCHD
-    printf("No connection for %u seconds -> POWER OFF and quit\n", DAEMON_NO_CONNECTION_TIMEOUT/1000);
-    hci_power_control( HCI_POWER_OFF);
-    hci_close();
-    exit(0);
-#else
     printf("No connection for %u seconds -> POWER OFF\n", DAEMON_NO_CONNECTION_TIMEOUT/1000);
     hci_power_control( HCI_POWER_OFF);
-#endif
-#endif
 }
 
 static int btstack_command_handler(connection_t *connection, uint8_t *packet, uint16_t size){