diff --git a/anki/sched.py b/anki/sched.py
index dc1d215d0..5b9a7ce9f 100644
--- a/anki/sched.py
+++ b/anki/sched.py
@@ -809,9 +809,12 @@ order by c.mod""" % ((self.dayCutoff-86400)*1000)
             # everything in the new queue
             queue = "0"
         else:
-            # due reviews stay in the review queue
-            queue = "(case when type=2 and (odue or due) <= %d then 2 else 0 end)"
-            queue %= self.today
+            # due reviews stay in the review queue. careful: can't use
+            # "odid or did", as sqlite converts to boolean
+            queue = """
+(case when type=2 and (case when odue then odue <= %d else due <= %d end)
+ then 2 else 0 end)"""
+            queue %= (self.today, self.today)
         self.col.db.executemany("""
 update cards set
 odid = (case when odid then odid else did end),