diff --git a/app/models/application_model.rb b/app/models/application_model.rb
index 50842b629..42f692a93 100644
--- a/app/models/application_model.rb
+++ b/app/models/application_model.rb
@@ -475,6 +475,7 @@ delete object activity stream, will be executed automatically
 =end
 
   def activity_stream_destroy
+    return if !@activity_stream_support_config
     ActivityStream.remove( self.class.to_s, self.id )
   end
 
@@ -620,6 +621,7 @@ delete object history, will be executed automatically
 =end
 
   def history_destroy
+    return if !@history_support_config
     History.remove( self.class.to_s, self.id )
   end