1 files changed, 2 insertions, 2 deletions

diff --git a/app/services/issues/close_service.rb b/app/services/issues/close_service.rb
index 21e9a2210fb..d5a542a418d 100644
--- a/app/services/issues/close_service.rb
+++ b/app/services/issues/close_service.rb
@@ -52,12 +52,12 @@ module Issues
     end
 
     def store_first_mentioned_in_commit_at(issue, merge_request)
-      return unless Feature.enabled?(:store_first_mentioned_in_commit_on_issue_close, issue.project)
+      return unless Feature.enabled?(:store_first_mentioned_in_commit_on_issue_close, issue.project, default_enabled: true)
 
       metrics = issue.metrics
       return if metrics.nil? || metrics.first_mentioned_in_commit_at
 
-      first_commit_timestamp = merge_request.commits(limit: 1).first&.date
+      first_commit_timestamp = merge_request.commits(limit: 1).first.try(:authored_date)
       return unless first_commit_timestamp
 
       metrics.update!(first_mentioned_in_commit_at: first_commit_timestamp)