diff --git a/changes/bug28524 b/changes/bug28524
new file mode 100644
index 0000000000000000000000000000000000000000..1cad700422ca819ecc29ebca016d31d4d0198556
--- /dev/null
+++ b/changes/bug28524
@@ -0,0 +1,4 @@
+  o Minor bugfixes (restart-in-process, boostrap):
+    - Add missing resets of bootstrap tracking state when shutting
+      down (regression caused by ticket 27169).  Fixes bug 28524;
+      bugfix on 0.3.5.1-alpha.
diff --git a/src/feature/control/control.c b/src/feature/control/control.c
index b31b448e96690b23275ebf38ee59638621c95ad6..65822b9fdd52dec45dd307d3bf20230ac007ee47 100644
--- a/src/feature/control/control.c
+++ b/src/feature/control/control.c
@@ -7885,8 +7885,12 @@ control_free_all(void)
     flush_queued_events_event = NULL;
   }
   bootstrap_percent = BOOTSTRAP_STATUS_UNDEF;
+  bootstrap_phase = BOOTSTRAP_STATUS_UNDEF;
   notice_bootstrap_percent = 0;
   bootstrap_problems = 0;
+  bootstrap_first_orconn = 0;
+  bootstrap_dir_progress = BOOTSTRAP_STATUS_UNDEF;
+  bootstrap_dir_phase = BOOTSTRAP_STATUS_UNDEF;
   authentication_cookie_is_set = 0;
   global_event_mask = 0;
   disable_log_messages = 0;