diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockFormController.php b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockFormController.php
index 3befde0..63a539d 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockFormController.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockFormController.php
@@ -9,6 +9,7 @@
 
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Entity\ContentEntityFormController;
+use Drupal\Core\Entity\ContentEntityFormHelper;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Entity\EntityStorageControllerInterface;
 use Drupal\Core\Language\Language;
@@ -39,13 +40,15 @@ class CustomBlockFormController extends ContentEntityFormController {
    *
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
    *   The entity manager.
+   * @param \Drupal\Core\Entity\ContentEntityFormHelper $entity_form_helper
+   *   The ContentEntity form helper.
    * @param \Drupal\Core\Entity\EntityStorageControllerInterface $custom_block_storage
    *   The custom block storage controller.
    * @param \Drupal\Core\Language\LanguageManager $language_manager
    *   The language manager.
    */
-  public function __construct(EntityManagerInterface $entity_manager, EntityStorageControllerInterface $custom_block_storage, LanguageManager $language_manager) {
-    parent::__construct($entity_manager);
+  public function __construct(EntityManagerInterface $entity_manager, ContentEntityFormHelper $entity_form_helper, EntityStorageControllerInterface $custom_block_storage, LanguageManager $language_manager) {
+    parent::__construct($entity_manager, $entity_form_helper);
     $this->customBlockStorage = $custom_block_storage;
     $this->languageManager = $language_manager;
   }
@@ -57,6 +60,7 @@ public static function create(ContainerInterface $container) {
     $entity_manager = $container->get('entity.manager');
     return new static(
       $entity_manager,
+      $container->get('entity.content.form_helper'),
       $entity_manager->getStorageController('custom_block'),
       $container->get('language_manager')
     );