diff --git a/reviewboard/diffviewer/diffutils.py b/reviewboard/diffviewer/diffutils.py
index 77818fa24a3afb155ea3eb670f86b2f06d5649d6..da378c89c791046f3b050c72e95781016e9a2be7 100644
--- a/reviewboard/diffviewer/diffutils.py
+++ b/reviewboard/diffviewer/diffutils.py
@@ -1110,7 +1110,7 @@ def get_diff_files(diffset, filediff=None, interdiffset=None,
 
 
 def get_file_chunks_in_range(context, filediff, interfilediff,
-                             first_line, num_lines):
+                             first_line, num_lines, enable_highlighting=True):
     """
     A generator that yields chunks within a range of lines in the specified
     filediff/interfilediff.
@@ -1164,8 +1164,10 @@ def get_file_chunks_in_range(context, filediff, interfilediff,
         files = context[key]
     else:
         assert 'user' in context
-        files = get_diff_files(filediff.diffset, filediff, interdiffset,
-                               get_enable_highlighting(context['user']))
+        files = get_diff_files(filediff.diffset,
+            filediff,
+            interdiffset,
+            enable_highlighting and get_enable_highlighting(context['user']))
         context[key] = files
 
     if not files: