diff --git a/app/models/linter_check_run.rb b/app/models/linter_check_run.rb
index e571cf37..51a8f6af 100644
--- a/app/models/linter_check_run.rb
+++ b/app/models/linter_check_run.rb
@@ -42,7 +42,7 @@ class LinterCheckRun < ApplicationRecord
     end
 
     # Now, we store all check runs and skip validations (they are already done)
-    LinterCheckRun.insert_all!(validated_check_runs) # rubocop:disable Rails/SkipsModelValidations
+    LinterCheckRun.insert_all!(validated_check_runs) if validated_check_runs.present? # rubocop:disable Rails/SkipsModelValidations
   end
   private_class_method :validate_and_store!
 end
diff --git a/app/models/testrun_message.rb b/app/models/testrun_message.rb
index a6d708a5..5ba257b3 100644
--- a/app/models/testrun_message.rb
+++ b/app/models/testrun_message.rb
@@ -94,7 +94,7 @@ class TestrunMessage < ApplicationRecord
     end
 
     # Now, we store all messages and skip validations (they are already done)
-    TestrunMessage.insert_all!(validated_messages) # rubocop:disable Rails/SkipsModelValidations
+    TestrunMessage.insert_all!(validated_messages) if validated_messages.present? # rubocop:disable Rails/SkipsModelValidations
   end
   private_class_method :validate_and_store!