diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
index a2c94fd97a..7f9fe4dccd 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
@@ -617,9 +617,12 @@ protected function getSelectQueryForFieldStorageDeletion($table_name, array $sha
     $select->addExpression(':delta', 'delta', [':delta' => 0]);
 
     // Add all the dynamic field columns.
+    $or = $select->orConditionGroup();
     foreach ($shared_table_field_columns as $field_column_name => $schema_column_name) {
       $select->addField('entity_table', $schema_column_name, $dedicated_table_field_columns[$field_column_name]);
+      $or->isNotNull($schema_column_name);
     }
+    $select->condition($or);
 
     // Lock the table rows.
     $select->forUpdate(TRUE);