diff --git a/src/dc_receive_imf.rs b/src/dc_receive_imf.rs
index bf07bd0e7..9dacc1a87 100644
--- a/src/dc_receive_imf.rs
+++ b/src/dc_receive_imf.rs
@@ -674,11 +674,6 @@ async fn add_parts(
                     )
                     .await;
                 }
-
-                context.emit_event(Event::ChatEphemeralTimerModified {
-                    chat_id: *chat_id,
-                    timer: timer.to_u32(),
-                });
             }
             Err(err) => {
                 warn!(
diff --git a/src/ephemeral.rs b/src/ephemeral.rs
index 32b9a7d50..83a9f6d14 100644
--- a/src/ephemeral.rs
+++ b/src/ephemeral.rs
@@ -176,6 +176,11 @@ impl ChatId {
                 paramsv![timer, self],
             )
             .await?;
+
+        context.emit_event(Event::ChatEphemeralTimerModified {
+            chat_id: self,
+            timer: timer.to_u32(),
+        });
         Ok(())
     }