diff --git a/aqt/reviewer.py b/aqt/reviewer.py
index 9cd9f7909..61b354f4c 100644
--- a/aqt/reviewer.py
+++ b/aqt/reviewer.py
@@ -476,7 +476,10 @@ function showAnswer(txt) {
         self._remaining(), _("Show Answer"))
         # wrap it in a table so it has the same top margin as the ease buttons
         middle = "<table cellpadding=0><tr><td class=stat2 align=center>%s</td></tr></table>" % middle
-        maxTime = self.card.timeLimit() / 1000
+        if self.card.shouldShowTimer():
+            maxTime = self.card.timeLimit() / 1000
+        else:
+            maxTime = 0
         self.bottom.web.eval("showQuestion(%s,%d);" % (
             simplejson.dumps(middle), maxTime))