--- a/toolkit/modules/Sqlite.jsm
+++ b/toolkit/modules/Sqlite.jsm
@@ -622,26 +622,29 @@ ConnectionData.prototype = Object.freeze
               this._log.warn("Error committing transaction", ex);
               throw ex;
             }
           }
 
           return result;
         } finally {
           this._hasInProgressTransaction = false;
+          // Ensure we don't hold onto anything for too long by keeping the timeout alive
+          clearTimeout(timeoutHandle);
         }
       })();
 
       // If a transaction yields on a never resolved promise, or is mistakenly
       // nested, it could hang the transactions queue forever.  Thus we timeout
       // the execution after a meaningful amount of time, to ensure in any case
       // we'll proceed after a while.
+      let timeoutHandle;
       let timeoutPromise = new Promise((resolve, reject) => {
-        setTimeout(() => reject(new Error("Transaction timeout, most likely caused by unresolved pending work.")),
-                   TRANSACTIONS_QUEUE_TIMEOUT_MS);
+        timeoutHandle = setTimeout(() => reject(new Error("Transaction timeout, most likely caused by unresolved pending work.")),
+                                   TRANSACTIONS_QUEUE_TIMEOUT_MS);
       });
       return Promise.race([transactionPromise, timeoutPromise]);
     });
     // Atomically update the queue before anyone else has a chance to enqueue
     // further transactions.
     this._transactionQueue = promise.catch(ex => { console.error(ex); });
 
     // Make sure that we do not shutdown the connection during a transaction.