diff --git a/common/lib/xmodule/xmodule/js/src/capa/display.coffee b/common/lib/xmodule/xmodule/js/src/capa/display.coffee
index d61813ce58..6b39805d1a 100644
--- a/common/lib/xmodule/xmodule/js/src/capa/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/capa/display.coffee
@@ -39,13 +39,12 @@ class @Problem
 
   poll: =>
     $.postWithPrefix "#{@url}/problem_get", (response) =>
-      @el.html(response.html)
-      @executeProblemScripts () =>
-        @setupInputTypes()
-        @bind()
-
-      @queued_items = @$(".xqueue")
+      @queued_items = $(response.html).find(".xqueue")
       if @queued_items.length == 0 
+        @el.html(response.html)
+        @executeProblemScripts () =>
+          @setupInputTypes()
+          @bind()
         delete window.queuePollerID
       else
         # TODO: Dynamically adjust timeout interval based on @queued_items.value