diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py
index 0f97de6f3f..ef3de02b37 100644
--- a/common/lib/xmodule/xmodule/capa_module.py
+++ b/common/lib/xmodule/xmodule/capa_module.py
@@ -8,7 +8,6 @@ import re
 import sys
 
 from datetime import timedelta
-from django.conf import settings
 from lxml import etree
 from pkg_resources import resource_string
 
@@ -467,7 +466,7 @@ class CapaModule(XModule):
         if self.lcp.is_queued():
             current_time = datetime.datetime.now()
             prev_submit_time = self.lcp.get_recentmost_queuetime() 
-            waittime_between_requests = settings.XQUEUE_WAITTIME_BETWEEN_REQUESTS
+            waittime_between_requests = self.system.xqueue.waittime
             if (current_time-prev_submit_time).total_seconds() < waittime_between_requests:
                 msg = 'You must wait at least %d seconds between submissions' % waittime_between_requests
                 return {'success': msg, 'html': ''}
diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py
index da9828fb12..0eaa1ee60f 100644
--- a/lms/djangoapps/courseware/module_render.py
+++ b/lms/djangoapps/courseware/module_render.py
@@ -217,7 +217,9 @@ def _get_module(user, request, location, student_module_cache, course_id, positi
 
     xqueue = {'interface': xqueue_interface,
               'callback_url': xqueue_callback_url,
-              'default_queuename': xqueue_default_queuename.replace(' ', '_')}
+              'default_queuename': xqueue_default_queuename.replace(' ', '_'),
+              'waittime': settings.XQUEUE_WAITTIME_BETWEEN_REQUESTS
+             }
 
     def inner_get_module(location):
         """