diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
index 2201fe3059..cdb9ae43a6 100644
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
@@ -1454,6 +1454,7 @@ protected function deleteSharedTableSchema(FieldStorageDefinitionInterface $stor
 
           // Drop the primary key, indexes and unique keys first.
           $this->dropPrimaryKey($table_name, $column_names);
+
           if (!empty($schema['indexes'])) {
             foreach ($schema['indexes'] as $name => $specifier) {
               $schema_handler->dropIndex($table_name, $name);
@@ -1639,10 +1640,9 @@ protected function updateSharedTableSchema(FieldStorageDefinitionInterface $stor
               }
             }
 
-            // Drop the primary key, indexes and unique keys first.
+            // Drop the original primary key, indexes and unique keys first.
             $this->dropPrimaryKey($table_name, $column_names);
 
-            // Drop original primary keys, indexes and unique keys.
             if (!empty($original_schema[$table_name]['indexes'])) {
               foreach ($original_schema[$table_name]['indexes'] as $name => $specifier) {
                 $schema_handler->dropIndex($table_name, $name);