diff --git a/lms/envs/common.py b/lms/envs/common.py
index 6c127b8049..8e91565784 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -406,7 +406,6 @@ MIDDLEWARE_CLASSES = (
     # 'debug_toolbar.middleware.DebugToolbarMiddleware',
 
     'django_comment_client.utils.ViewNameMiddleware',
-    'django_comment_client.utils.QueryCountDebugMiddleware',
 )
 
 ############################### Pipeline #######################################
diff --git a/lms/envs/dev.py b/lms/envs/dev.py
index a9f1454193..d833a5a2fc 100644
--- a/lms/envs/dev.py
+++ b/lms/envs/dev.py
@@ -135,7 +135,8 @@ MITX_FEATURES['AUTH_USE_MIT_CERTIFICATES'] = True
 
 ################################ DEBUG TOOLBAR #################################
 INSTALLED_APPS += ('debug_toolbar',)
-MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
+MIDDLEWARE_CLASSES += ('django_comment_client.utils.QueryCountDebugMiddleware',
+                       'debug_toolbar.middleware.DebugToolbarMiddleware',)
 INTERNAL_IPS = ('127.0.0.1',)
 
 DEBUG_TOOLBAR_PANELS = (