diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index 6a8d663c5a..a418a7948d 100644
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -456,6 +456,11 @@ class PostUpdate
 			return true;
 		}
 
+		if (!DBStructure::existsTable('item-delivery-data')) {
+			DI::config()->set('system', 'post_update_version', 1297);
+			return true;
+		}
+
 		$max_item_delivery_data = DBA::selectFirst('item-delivery-data', ['iid'], ['queue_count > 0 OR queue_done > 0'], ['order' => ['iid']]);
 		$max_iid = $max_item_delivery_data['iid'];
 
@@ -700,6 +705,11 @@ class PostUpdate
 			return true;
 		}
 
+		if (!DBStructure::existsTable('item-delivery-data')) {
+			DI::config()->set('system', 'post_update_version', 1345);
+			return true;
+		}
+
 		$id = DI::config()->get('system', 'post_update_version_1345_id', 0);
 
 		Logger::info('Start', ['item' => $id]);
diff --git a/update.php b/update.php
index 6152e2b1e0..8414ce4f04 100644
--- a/update.php
+++ b/update.php
@@ -348,7 +348,9 @@ function update_1309()
 
 function update_1315()
 {
-	DBA::delete('item-delivery-data', ['postopts' => '', 'inform' => '', 'queue_count' => 0, 'queue_done' => 0]);
+	if (DBStructure::existsTable('item-delivery-data')) {
+		DBA::delete('item-delivery-data', ['postopts' => '', 'inform' => '', 'queue_count' => 0, 'queue_done' => 0]);
+	}
 	return Update::SUCCESS;
 }