diff --git a/chrome/content/zotero/xpcom/db.js b/chrome/content/zotero/xpcom/db.js
index 3e3b75cae..6936b2c5b 100644
--- a/chrome/content/zotero/xpcom/db.js
+++ b/chrome/content/zotero/xpcom/db.js
@@ -320,6 +320,11 @@ Zotero.DB = new function(){
 	function rollbackTransaction(){
 		var db = _getDBConnection();
 		
+		if (!db.transactionInProgress) {
+			Zotero.debug("Transaction is not in progress in rollbackTransaction()", 2);
+			return;
+		}
+		
 		if (_transactionNestingLevel){
 			_transactionNestingLevel--;
 			_transactionRollback = true;