diff --git a/lms/djangoapps/django_comment_client/forum/views.py b/lms/djangoapps/django_comment_client/forum/views.py
index 560e19a97b..e77e11066b 100644
--- a/lms/djangoapps/django_comment_client/forum/views.py
+++ b/lms/djangoapps/django_comment_client/forum/views.py
@@ -248,7 +248,8 @@ def single_thread(request, course_id, discussion_id, thread_id):
         # TODO: Remove completely or switch back to server side rendering
         html = render_to_string('discussion/_ajax_single_thread.html', context)
         content = utils.safe_content(thread.to_dict())
-        content.update(courseware_context)
+        if courseware_context:
+            content.update(courseware_context)
         return utils.JsonResponse({
             'html': html,
             'content': content,