diff --git a/data/system/boot/Bootscript b/data/system/boot/Bootscript
index 7a6b0a265c..977871dd37 100644
--- a/data/system/boot/Bootscript
+++ b/data/system/boot/Bootscript
@@ -71,15 +71,16 @@ fi
 # Launch servers
 
 # We must wait for the app_server and registrar to be ready
+launch $SERVERS/registrar _roster_thread_	# launch registrar
+
+launch $SERVERS/debug_server				# launch debug_server
+
 if [ "$SAFEMODE" != "yes" ]; then
 	launch $SERVERS/app_server picasso		# launch app_server
 else
 	launch $SERVERS/fake_app_server picasso
 fi
 
-launch $SERVERS/registrar _roster_thread_	# launch registrar
-launch $SERVERS/debug_server				# launch debug_server
-
 if [ "$SAFEMODE" != "yes" ]; then
 	launch $SERVERS/syslog_daemon
 	# ToDo: the input_server is supposed to be started by the app_server