diff --git a/bin/console-conf-wrapper b/bin/console-conf-wrapper
index 106b50df..a830e9f3 100755
--- a/bin/console-conf-wrapper
+++ b/bin/console-conf-wrapper
@@ -67,6 +67,13 @@ if [ "$(snap managed)" = "true" ]; then
     exit 0
 fi
 
+if grep -q 'snapd_recovery_mode=install' /proc/cmdline; then
+    snap watch --last=install-system
+    snap tasks --last=install-system
+    read REPLY
+    exit 0
+fi
+
 cat /usr/share/subiquity/console-conf-wait
 read REPLY
 exec console-conf "$@"