diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js
index 66ad6e4db8..96769d5b08 100644
--- a/chrome/content/zotero/xpcom/schema.js
+++ b/chrome/content/zotero/xpcom/schema.js
@@ -1758,6 +1758,12 @@ Zotero.Schema = new function(){
 		// error, and either true or data to pass to the repair function on error. Functions should
 		// avoid assuming any global state (e.g., loaded data).
 		var checks = [
+			/*
+			Currently disabled, because it can cause problems with schema update steps that don't
+			expect tables to exist.
+			
+			The test "should repair a missing userdata table" is also disabled.
+			
 			// Create any tables or indexes that are missing and delete any tables or triggers that
 			// still exist but should have been deleted
 			[
@@ -1831,6 +1837,7 @@ Zotero.Schema = new function(){
 					}
 				}
 			],
+			*/
 			
 			// Foreign key checks
 			[
diff --git a/test/tests/schemaTest.js b/test/tests/schemaTest.js
index 462070389d..5e2491237b 100644
--- a/test/tests/schemaTest.js
+++ b/test/tests/schemaTest.js
@@ -248,7 +248,7 @@ describe("Zotero.Schema", function() {
 			});
 		})
 		
-		it("should repair a missing userdata table", async function () {
+		it.skip("should repair a missing userdata table", async function () {
 			await Zotero.DB.queryAsync("DROP TABLE retractedItems");
 			assert.isFalse(await Zotero.DB.tableExists('retractedItems'));
 			assert.isFalse(await Zotero.Schema.integrityCheck());