diff --git a/datasette/utils.py b/datasette/utils.py
index 0c161ac6..7ebf4f23 100644
--- a/datasette/utils.py
+++ b/datasette/utils.py
@@ -152,8 +152,10 @@ def sqlite_timelimit(conn, ms):
             return 1
 
     conn.set_progress_handler(handler, n)
-    yield
-    conn.set_progress_handler(None, n)
+    try:
+        yield
+    finally:
+        conn.set_progress_handler(None, n)
 
 
 class InvalidSql(Exception):