diff --git a/ROMFS/tap_common/init.d/rcS b/ROMFS/tap_common/init.d/rcS
index 6e30775b74..e7587abbb1 100644
--- a/ROMFS/tap_common/init.d/rcS
+++ b/ROMFS/tap_common/init.d/rcS
@@ -20,6 +20,7 @@ sercon
 
 set TUNE_ERR ML<<CP4CP4CP4CP4CP4
 set LOG_FILE /fs/microsd/bootlog.txt
+set DATAMAN_OPT -r
 
 #
 # Try to mount the microSD card.
@@ -27,12 +28,14 @@ set LOG_FILE /fs/microsd/bootlog.txt
 if mount -t vfat /dev/mmcsd0 /fs/microsd
 then
 	echo "microSD present"
+	unset DATAMAN_OPT
 else
 	if mkfatfs /dev/mmcsd0
 	then
 		if mount -t vfat /dev/mmcsd0 /fs/microsd
 		then
 			echo "microSD card formatted"
+			unset DATAMAN_OPT
 		else
 			echo "ERROR [init] Format failed"
 			tone_alarm MNBG
@@ -141,7 +144,7 @@ gps start -d /dev/ttyS0
 
 # waypoint storage
 # REBOOTWORK this needs to start in parallel
-if dataman start
+if dataman start $DATAMAN_OPT
 then
 fi