diff --git a/CHANGELOG b/CHANGELOG
index fc721d3d155..f133cb24780 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -73,7 +73,6 @@ v 7.10.0 (unreleased)
   - Automatically setup GitLab CI project for forks if origin project has GitLab CI enabled
   - Bust group page project list cache when namespace name or path changes.
   - Explicitly set image alt-attribute to prevent graphical glitches if gravatars could not be loaded
-  - Fix stuck Merge Request merging events from old installations (Ben Bodenmiller)
 
 v 7.9.3
   - Contains no changes
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 92026356b62..35cb920d8bc 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -361,6 +361,6 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def locked_long_ago?
-    locked_at.nil? || locked_at < (Time.now - 1.day)
+    locked_at && locked_at < (Time.now - 1.day)
   end
 end