diff --git a/app/models/environment.rb b/app/models/environment.rb
index 803060b3979..1a21b5e52b5 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -126,7 +126,7 @@ class Environment < ActiveRecord::Base
     return unless available?
 
     stop!
-    stop_action.play(current_user) if stop_action
+    stop_action&.play(current_user)
   end
 
   def actions_for(environment)
diff --git a/app/services/issues/create_service.rb b/app/services/issues/create_service.rb
index c9168f74249..961605a1005 100644
--- a/app/services/issues/create_service.rb
+++ b/app/services/issues/create_service.rb
@@ -15,7 +15,7 @@ module Issues
     def before_create(issuable)
       if @recaptcha_verified
         spam_log = current_user.spam_logs.find_by(id: @spam_log_id, title: issuable.title)
-        spam_log.update!(recaptcha_verified: true) if spam_log
+        spam_log&.update!(recaptcha_verified: true)
       else
         issuable.spam = spam_service.check(@api)
         issuable.spam_log = spam_service.spam_log