diff --git a/app/models/diff_discussion.rb b/app/models/diff_discussion.rb
index 758a26d3c7085e9a26e5cfad2970e3b00f9d5447..d67b16584a4ae84355cdeb1726996846c68e9046 100644
--- a/app/models/diff_discussion.rb
+++ b/app/models/diff_discussion.rb
@@ -23,9 +23,8 @@ class DiffDiscussion < Discussion
   def merge_request_version_params
     return unless for_merge_request?
 
-    version_params do |params|
+    version_params.tap do |params|
       params[:commit_id] = commit_id if on_merge_request_commit?
-      params
     end
   end
 
@@ -39,11 +38,8 @@ class DiffDiscussion < Discussion
   private
 
   def version_params
-    params = if active?
-               {}
-             else
-               noteable.version_params_for(position.diff_refs)
-             end
-    yield params
+    return {} if active?
+
+    noteable.version_params_for(position.diff_refs)
   end
 end