diff --git a/config/boards/rpi4b.conf b/config/boards/rpi4b.conf
index 470d76ffb1..0cf86774aa 100644
--- a/config/boards/rpi4b.conf
+++ b/config/boards/rpi4b.conf
@@ -5,6 +5,12 @@ export KERNEL_TARGET="current,edge"
 export FK__MACHINE_MODEL="Raspberry Pi 4 Model B" # flash kernel (FK) configuration
 export ASOUND_STATE="asound.state.rpi"
 
+# Our default paritioning system is leaving esp on. Rpi3 is the only board that have issues with this.
+# Removing the ESP flag from the boot partition should allow the image to boot on both the RPi3 and RPi4.
+pre_umount_final_image__remove_esp() {
+	sudo parted -s $LOOP set 1 esp off
+}
+
 # configure stuff at the appropriate time in flash-kernel
 pre_initramfs_flash_kernel__write_raspi_config() {
 	# for serial console, there is also 'BOOT_UART=1' in 'rpi-eeprom-config' but that is for an earlier stage.