diff --git a/core/modules/layout_builder/src/Form/ConfigureBlockFormBase.php b/core/modules/layout_builder/src/Form/ConfigureBlockFormBase.php
index 65afe452eec..76f2526d041 100644
--- a/core/modules/layout_builder/src/Form/ConfigureBlockFormBase.php
+++ b/core/modules/layout_builder/src/Form/ConfigureBlockFormBase.php
@@ -166,9 +166,6 @@ abstract class ConfigureBlockFormBase extends FormBase implements BaseFormIdInte
 
     $form_state->setTemporaryValue('gathered_contexts', $this->getPopulatedContexts($section_storage));
 
-    // @todo Remove once https://www.drupal.org/node/2268787 is resolved.
-    $form_state->set('block_theme', $this->config('system.theme')->get('default'));
-
     $form['#tree'] = TRUE;
     $form['settings'] = [];
     $subform_state = SubformState::createForSubform($form['settings'], $form, $form_state);