diff --git a/data/system/boot/Bootscript b/data/system/boot/Bootscript
index 57e2b65534..223f6090e4 100644
--- a/data/system/boot/Bootscript
+++ b/data/system/boot/Bootscript
@@ -104,10 +104,6 @@ fi
 # 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