Hardik Patel
--- a/core/modules/layout_builder/src/Plugin/Block/ExtraFieldBlock.php
+++ b/core/modules/layout_builder/src/Plugin/Block/ExtraFieldBlock.php
+   */
+  public static function preRenderBlock(array $block_build): array {
+    $content = $block_build['content'] ?? NULL;
+    if ($content === NULL || Element::isEmpty($content)) {
+      // Block content is empty, abort rendering the whole block and preserve
+      // cache metadata.
+      // @see \Drupal\Core\Render\Renderer::doRender
+      $block_build['#printed'] = TRUE;
+    }
+    return $block_build;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function trustedCallbacks() {
-  public static function trustedCallbacks() {
+  public static function trustedCallbacks(): array {
--- a/core/modules/layout_builder/tests/src/Functional/LayoutBuilderTest.php
+++ b/core/modules/layout_builder/tests/src/Functional/LayoutBuilderTest.php
    // Confirm that the newly added extra field is visible.
    $this->drupalGet('node/1');
    $assert_session->pageTextContains('Extra Field 2 is hidden by default.');
+
+    // Ensure empty extra field and its container are not rendered.
+    /** @see \Drupal\layout_builder\Plugin\Block\ExtraFieldBlock::preRenderBlock */
+    $assert_session->elementNotExists('css', '.block-extra-field-blocknodebundle-with-section-fieldlayout-builder-test-empty');
--- a/core/modules/layout_builder/tests/modules/layout_builder_test/layout_builder_test.module
+++ b/core/modules/layout_builder/tests/modules/layout_builder_test/layout_builder_test.module
     '#markup' => 'Extra Field 2 is hidden by default.',
   ];
 }
+ if ($display->getComponent('layout_builder_test_empty')) {
+   $build['layout_builder_test_empty'] = [
+     '#cache' => [],
+   ];
+ }