diff --git a/src/daemon.rs b/src/daemon.rs
index 1ebff464..c31a5fe8 100644
--- a/src/daemon.rs
+++ b/src/daemon.rs
@@ -545,7 +545,7 @@ pub fn daemon_init(settings: Settings, config: Config) -> Result<Daemon, Error>
     }
 
     let message = format_message(
-        settings.edit,
+        edit, // Use current edit because settings.edit has not changed
         started_as_edit,
         forced_reason,
         settings.delay,
@@ -556,7 +556,7 @@ pub fn daemon_init(settings: Settings, config: Config) -> Result<Daemon, Error>
         verbose: settings.verbose,
         delay: settings.delay,
         delay_battery: settings.delay_battery,
-        edit,
+        edit, // Use new edit for new settings
         no_animation: settings.no_animation,
         should_graph: settings.should_graph,
         commit: settings.commit,