diff --git a/reviewboard/reviews/templatetags/reviewtags.py b/reviewboard/reviews/templatetags/reviewtags.py
index 9b9e9cb40e94c77152f722bee9384aa0fa8fc6c2..4e2db9b568c024ab03dcbe5972a0e265b782c8f3 100644
--- a/reviewboard/reviews/templatetags/reviewtags.py
+++ b/reviewboard/reviews/templatetags/reviewtags.py
@@ -1011,6 +1011,10 @@ def reviewable_page_model_data(context):
 
     if review_request.created_with_history:
         diffset = review_request_details.get_latest_diffset()
+
+        if diffset is None:
+            diffset = review_request.get_latest_diffset()
+
         editor_data['commits'] = [
             commit.serialize()
             for commit in diffset.commits.all()