diff --git a/board/tinkerboard/overlay-initramfs/remove_initramfs b/board/tinkerboard/overlay-initramfs/remove_initramfs
index 536c5b3b90..c0d168d40a 100755
--- a/board/tinkerboard/overlay-initramfs/remove_initramfs
+++ b/board/tinkerboard/overlay-initramfs/remove_initramfs
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-sed -i 's/^initrd.*//g' /boot/extlinux/extlinux.conf
+sed 's/\([ ]*\)\(initrd.*\)/\1#\2/g' /boot/extlinux/extlinux.conf
 
diff --git a/board/tinkerboard/overlay/usr/libexec/fw-prepare-boot b/board/tinkerboard/overlay/usr/libexec/fw-prepare-boot
index 40ae425686..f77bc72d94 100755
--- a/board/tinkerboard/overlay/usr/libexec/fw-prepare-boot
+++ b/board/tinkerboard/overlay/usr/libexec/fw-prepare-boot
@@ -1,4 +1,5 @@
 #!/bin/bash
 
+cat /boot/extlinux/extlinux.conf | grep -v 'initrd' > /boot/extlinux/extlinux.conf
 echo "    initrd /initrd.gz" >> /boot/extlinux/extlinux.conf