diff --git a/app/presenters/conversations/event_data_presenter.rb b/app/presenters/conversations/event_data_presenter.rb
index 67c7dc1dd..6e161a89e 100644
--- a/app/presenters/conversations/event_data_presenter.rb
+++ b/app/presenters/conversations/event_data_presenter.rb
@@ -40,6 +40,7 @@ class Conversations::EventDataPresenter < SimpleDelegator
     {
       agent_last_seen_at: agent_last_seen_at.to_i,
       contact_last_seen_at: contact_last_seen_at.to_i,
+      last_activity_at: last_activity_at ? last_activity_at.to_i : created_at.to_i,
       timestamp: last_activity_at.to_i,
       created_at: created_at.to_i
     }