diff --git a/core/modules/block_content/block_content.install b/core/modules/block_content/block_content.install
index e9f6926..4e2ecaf 100644
--- a/core/modules/block_content/block_content.install
+++ b/core/modules/block_content/block_content.install
@@ -5,7 +5,9 @@
  * Install, update and uninstall functions for the block_content module.
  */
 
+use Drupal\block_content\BlockContentStorageSchema;
 use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
 
 /**
@@ -77,13 +79,13 @@ function block_content_update_8300() {
   if ($db_schema->fieldExists('block_content_field_data', 'content_translation_status')) {
     $db->update('block_content_field_data', 'bcfd')
       ->fields(['content_translation_status' => 1])
-      ->where('content_translation_status', NULL)
+      ->isNull('content_translation_status')
       ->execute();
   }
   if ($db_schema->fieldExists('block_content_field_revision', 'content_translation_status')) {
     $db->update('block_content_field_revision', 'bcfd')
       ->fields(['content_translation_status' => 1])
-      ->where('content_translation_status', NULL)
+      ->isNull('content_translation_status')
       ->execute();
   }
 
@@ -92,7 +94,7 @@ function block_content_update_8300() {
   $entity_keys = $entity_type->getKeys();
   $entity_keys['published'] = 'status';
   $entity_type->set('entity_keys', $entity_keys);
-  $entity_type->setHandlerClass('storage_schema', 'Drupal\block_content\BlockContentStorageSchema');
+  $entity_type->setHandlerClass('storage_schema', BlockContentStorageSchema::class);
   $manager->updateEntityType($entity_type);
 
   $status = BaseFieldDefinition::create('boolean')
@@ -105,7 +107,9 @@ function block_content_update_8300() {
   $manager->installFieldStorageDefinition('status', 'block_content', 'block_content', $status);
 
   $content_translation_status = $manager->getFieldStorageDefinition('content_translation_status', 'block_content');
-  $manager->uninstallFieldStorageDefinition($content_translation_status);
+  if ($content_translation_status instanceof FieldStorageDefinitionInterface) {
+    $manager->uninstallFieldStorageDefinition($content_translation_status);
+  }
 
   if ($db_schema->fieldExists('block_content_field_data', 'content_translation_status')) {
     $db_schema->dropField('block_content_field_data', 'content_translation_status');