diff --git a/app/services/discussions/resolve_service.rb b/app/services/discussions/resolve_service.rb
index 4a803b47bba47a799bc12f6fa5e002b5e447c018..0437195f58833dc2c481f2a5576b68323c7f17f2 100644
--- a/app/services/discussions/resolve_service.rb
+++ b/app/services/discussions/resolve_service.rb
@@ -9,13 +9,7 @@ module Discussions
 
       discussion.resolve!(current_user)
 
-      notify_discussion_resolved(discussion)
-    end
-
-    def notify_discussion_resolved(discussion)
-      noteable = merge_request || discussion.noteable
-
-      MergeRequests::ResolvedDiscussionNotificationService.new(project, current_user).execute(noteable)
+      MergeRequests::ResolvedDiscussionNotificationService.new(project, current_user).execute(merge_request)
       SystemNoteService.discussion_continued_in_issue(discussion, project, current_user, follow_up_issue) if follow_up_issue
     end
 
diff --git a/spec/services/discussions/resolve_service_spec.rb b/spec/services/discussions/resolve_service_spec.rb
index 5eb5b2b04d7aaeeb29dba5b6725abcfcdfff5660..12c3cdf28c6883d518afeb6ce2f9d0d25f27395c 100644
--- a/spec/services/discussions/resolve_service_spec.rb
+++ b/spec/services/discussions/resolve_service_spec.rb
@@ -6,7 +6,7 @@ describe Discussions::ResolveService do
     let(:project) { merge_request.project }
     let(:merge_request) { discussion.noteable }
     let(:user) { create(:user) }
-    let(:service) { described_class.new(discussion.noteable.project, user) }
+    let(:service) { described_class.new(discussion.noteable.project, user, merge_request: merge_request) }
 
     before do
       project.team << [user, :master]