diff --git a/configs/images/raspberrypi_raspbian_config b/configs/images/raspberrypi_raspbian_config
index 29f9cea..8109283 100644
--- a/configs/images/raspberrypi_raspbian_config
+++ b/configs/images/raspberrypi_raspbian_config
@@ -46,14 +46,3 @@ EOF
 }
 
 PLATFORM_MODIFY_HOOKS+=(grow_data_partition)
-
-#
-# Create the Mender Configure state folder in the data partition and symlink it
-#
-function create_mender_configure_state_folder_data_partition() {
-    log_info "Creating the Mender Configure state folder in the data partition"
-    run_and_log_cmd "sudo mkdir -p work/rootfs/data/mender-configure"
-    run_and_log_cmd "sudo ln -sf /data/mender-configure work/rootfs/var/lib/mender-configure"
-}
-
-PLATFORM_MODIFY_HOOKS+=(create_mender_configure_state_folder_data_partition)
diff --git a/mender-convert-modify b/mender-convert-modify
index 1acd617..cf8f215 100755
--- a/mender-convert-modify
+++ b/mender-convert-modify
@@ -155,11 +155,15 @@ if [ "${MENDER_ADDON_CONFIGURE_INSTALL}" = "y" ]; then
     fi
 
     deb_extract_package "work/deb-packages/${deb_name}" "work/rootfs/"
-
-    run_and_log_cmd "sudo mkdir -p work/rootfs/data/mender-configure"
-    run_and_log_cmd "sudo ln -sf /data/mender-configure work/rootfs/var/lib/mender-configure"
 fi
 
+# Do this unconditionally even if not installing mender-configure. The reason is
+# that if the Debian package is installed later, this folder has to preexist. It
+# is part of the rootfs setup, independently of the software.
+log_info "Creating the Mender Configure state folder in the data partition"
+run_and_log_cmd "sudo mkdir -p work/rootfs/data/mender-configure"
+run_and_log_cmd "sudo ln -sf /data/mender-configure work/rootfs/var/lib/mender-configure"
+
 if [ "${MENDER_GRUB_EFI_INTEGRATION}" == "y" ]; then
     # Check for known U-Boot problems in all files on the boot partition.
     check_for_broken_uboot_uefi_support work/boot