diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb
index 06b28fc5a75..7e22491d0a3 100644
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -46,7 +46,8 @@ class MergeRequestDiff < ActiveRecord::Base
         compare.diffs(options)
       end
     else
-      @diffs ||= load_diffs(st_diffs, options)
+      @diffs ||= {}
+      @diffs[options[:paths]] ||= load_diffs(st_diffs, options)
     end
   end