diff --git a/typo3/sysext/backend/Classes/Form/Container/FlexFormTabsContainer.php b/typo3/sysext/backend/Classes/Form/Container/FlexFormTabsContainer.php
index df27b14dc4ad2d375c9d746603b74236b36124af..83f07f8b1d3d2f4df0aac634e4f89ce395220c5f 100644
--- a/typo3/sysext/backend/Classes/Form/Container/FlexFormTabsContainer.php
+++ b/typo3/sysext/backend/Classes/Form/Container/FlexFormTabsContainer.php
@@ -96,14 +96,16 @@ class FlexFormTabsContainer extends AbstractContainer
             $options['renderType'] = 'flexFormElementContainer';
             $childReturn = $this->nodeFactory->create($options)->render();
 
-            $tabElements[] = [
-                'label' => !empty(trim($sheetDataStructure['ROOT']['sheetTitle'])) ? $languageService->sL(trim($sheetDataStructure['ROOT']['sheetTitle'])) : $sheetName,
-                'content' => $childReturn['html'],
-                'description' => trim($sheetDataStructure['ROOT']['sheetDescription']) ? $languageService->sL(trim($sheetDataStructure['ROOT']['sheetDescription'])) : '',
-                'linkTitle' => trim($sheetDataStructure['ROOT']['sheetShortDescr']) ? $languageService->sL(trim($sheetDataStructure['ROOT']['sheetShortDescr'])) : '',
-            ];
-
-            $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $childReturn, false);
+            if ($childReturn['html'] !== '') {
+                $tabElements[] = [
+                    'label' => !empty(trim($sheetDataStructure['ROOT']['sheetTitle'])) ? $languageService->sL(trim($sheetDataStructure['ROOT']['sheetTitle'])) : $sheetName,
+                    'content' => $childReturn['html'],
+                    'description' => trim($sheetDataStructure['ROOT']['sheetDescription']) ? $languageService->sL(trim($sheetDataStructure['ROOT']['sheetDescription'])) : '',
+                    'linkTitle' => trim($sheetDataStructure['ROOT']['sheetShortDescr']) ? $languageService->sL(trim($sheetDataStructure['ROOT']['sheetShortDescr'])) : '',
+                ];
+
+                $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $childReturn, false);
+            }
         }
 
         $fieldInformationResult = $this->renderFieldInformation();
diff --git a/typo3/sysext/backend/Classes/Form/Container/TabsContainer.php b/typo3/sysext/backend/Classes/Form/Container/TabsContainer.php
index 7ff9f14148010bd47db2f7e3b13ffe05a3dde0b4..d002c3ecb3bffc5bcc605c5ca2161b24a9c92b5d 100644
--- a/typo3/sysext/backend/Classes/Form/Container/TabsContainer.php
+++ b/typo3/sysext/backend/Classes/Form/Container/TabsContainer.php
@@ -85,11 +85,13 @@ class TabsContainer extends AbstractContainer
             $options['renderType'] = 'paletteAndSingleContainer';
             $childArray = $this->nodeFactory->create($options)->render();
 
-            $tabElements[] = [
-                'label' => $tabWithLabelAndElements['label'],
-                'content' => $childArray['html'],
-            ];
-            $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $childArray, false);
+            if ($childArray['html'] !== '') {
+                $tabElements[] = [
+                    'label' => $tabWithLabelAndElements['label'],
+                    'content' => $childArray['html'],
+                ];
+                $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $childArray, false);
+            }
         }
 
         $resultArray['html'] = $this->renderTabMenu($tabElements, $domIdPrefix);