diff --git a/packages/bsp/common/etc/init.d/armhwinfo b/packages/bsp/common/etc/init.d/armhwinfo
index b32f7c18c6..e5cc4517c4 100755
--- a/packages/bsp/common/etc/init.d/armhwinfo
+++ b/packages/bsp/common/etc/init.d/armhwinfo
@@ -371,6 +371,10 @@ add_usb_storage_quirks() {
 	read USBQUIRKS <${TMPFILE}
 	sed -i '/^usbstoragequirks/d' /boot/armbianEnv.txt
 	echo "usbstoragequirks=${USBQUIRKS}" >>/boot/armbianEnv.txt
+	# Make sure /boot/armbianEnv.txt is completely written to disk given
+	# we flush to disk infrequently and corruption of this file can have
+	# nasty side-effects
+	sync
 	if [ -f /sys/module/usb_storage/parameters/quirks ]; then
 		echo ${USBQUIRKS} >/sys/module/usb_storage/parameters/quirks
 	fi