diff --git a/anki/deck.py b/anki/deck.py
index b093f9291..dbf13eacc 100644
--- a/anki/deck.py
+++ b/anki/deck.py
@@ -660,6 +660,8 @@ limit %s""" % (self.cramOrder, self.queueLimit)))
         id = self.getCardId()
         if id:
             return self.cardFromId(id, orm)
+        else:
+            self.stopSession()
 
     def _getCardId(self, check=True):
         "Return the next due card id, or None."
@@ -2902,6 +2904,9 @@ select id from facts where spaceUntil like :_ff_%d escape '\\'""" % c
         self.sessionStartTime = time.time()
         self.sessionStartReps = self.getStats()['dTotal']
 
+    def stopSession(self):
+        self.sessionStartTime = 0
+
     def sessionLimitReached(self):
         if not self.sessionStartTime:
             # not started