diff --git a/combustion b/combustion
index c13a752..dd42239 100644
--- a/combustion
+++ b/combustion
@@ -84,11 +84,6 @@ cleanup() {
 
 trap cleanup EXIT
 
-if ! [ -d "${config_mount}/combustion" ]; then
-	echo "No config found - doing nothing."
-	exit 0
-fi
-
 # ignition-mount.service mounts stuff below /sysroot in ExecStart and umounts
 # it on ExecStop, failing if umounting fails. This conflicts with the
 # mounts/umounts done by combustion. Ignition is already done, so just stop it.
@@ -96,6 +91,11 @@ if systemctl --quiet is-active ignition-mount.service; then
 	systemctl stop ignition-mount.service
 fi
 
+if ! [ -d "${config_mount}/combustion" ]; then
+	echo "No config found - doing nothing."
+	exit 0
+fi
+
 # Copy config
 mkdir "${exchangedir}"
 config_dir="${exchangedir}/config"
diff --git a/combustion.changes b/combustion.changes
index bdf662f..61eeb22 100644
--- a/combustion.changes
+++ b/combustion.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 13 09:00:58 UTC 2020 - Fabian Vogt <fvogt@suse.com>
+
+- Also stop ignition-mount.service if there's no config
+
 -------------------------------------------------------------------
 Tue Oct  6 10:19:57 UTC 2020 - Fabian Vogt <fvogt@suse.com>