diff --git a/app/models/application_model/activity_stream_base.rb b/app/models/application_model/activity_stream_base.rb
index d2d0155a8..1f0317712 100644
--- a/app/models/application_model/activity_stream_base.rb
+++ b/app/models/application_model/activity_stream_base.rb
@@ -23,6 +23,9 @@ returns
     # return if we run import mode
     return if Setting.get('import_mode')
 
+    # return if we run on init mode
+    return if !Setting.get('system_init_done')
+
     role       = self.class.activity_stream_support_config[:role]
     updated_at = self.updated_at
     if force
diff --git a/app/models/ticket/activity_stream_log.rb b/app/models/ticket/activity_stream_log.rb
index c79e3a9a7..889f02131 100644
--- a/app/models/ticket/activity_stream_log.rb
+++ b/app/models/ticket/activity_stream_log.rb
@@ -20,6 +20,9 @@ returns
     # return if we run import mode
     return if Setting.get('import_mode')
 
+    # return if we run on init mode
+    return if !Setting.get('system_init_done')
+
     return if !self.class.activity_stream_support_config
     role = self.class.activity_stream_support_config[:role]
     ActivityStream.add(
diff --git a/app/models/ticket/article/activity_stream_log.rb b/app/models/ticket/article/activity_stream_log.rb
index 19427c909..a0aeb33f0 100644
--- a/app/models/ticket/article/activity_stream_log.rb
+++ b/app/models/ticket/article/activity_stream_log.rb
@@ -20,6 +20,9 @@ returns
     # return if we run import mode
     return if Setting.get('import_mode')
 
+    # return if we run on init mode
+    return if !Setting.get('system_init_done')
+
     return if !self.class.activity_stream_support_config
     role = self.class.activity_stream_support_config[:role]
     ticket = Ticket.lookup( :id => self.ticket_id )