diff --git a/data/system/boot/Bootscript b/data/system/boot/Bootscript
index a6dc718364..57e2b65534 100644
--- a/data/system/boot/Bootscript
+++ b/data/system/boot/Bootscript
@@ -96,10 +96,18 @@ else
 	launch beos/bin/consoled
 fi
 
+if [ "$SAFEMODE" != "yes" ]; then
+	launch $SERVERS/media_server
+fi
+
 # Check for daily saving time
 # TODO to be launched when tracker and deskbar are launched
 #launch beos/bin/dstcheck
 
+if [ "$SAFEMODE" != "yes" ]; then
+	launch $SERVERS/media_server
+else
+
 if [ "$SAFEMODE" != "yes" ]; then
 	# Start user boot script
 	if [ -f $HOME/config/boot/UserBootscript ]; then