diff --git a/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php b/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php
index 689eddea452b57911d2c7145bda94c8ecde8b04c..7418c96d75bd20000fbebe9dbc9d0e9cba859366 100644
--- a/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php
+++ b/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php
@@ -95,7 +95,10 @@ class InfoPageTyposcriptConfigController extends \TYPO3\CMS\Backend\Module\Abstr
 
         if ($pageId === 0) {
             $this->view->assign('pageZero', 1);
-            $this->view->assign('overviewOfPagesUsingTSConfig', $this->getOverviewOfPagesUsingTSConfig());
+            $pagesUsingTSConfig = $this->getOverviewOfPagesUsingTSConfig();
+            if (count($pagesUsingTSConfig) > 0) {
+                $this->view->assign('overviewOfPagesUsingTSConfig', $pagesUsingTSConfig);
+            }
         } else {
             if ($this->pObj->MOD_SETTINGS['tsconf_parts'] == 99) {
                 $TSparts = BackendUtility::getPagesTSconfig($this->pObj->id, null, true);
@@ -328,7 +331,7 @@ class InfoPageTyposcriptConfigController extends \TYPO3\CMS\Backend\Module\Abstr
                 continue;
             }
             $line = [];
-            $line['padding'] = ($pageDepth * 20);
+            $line['padding'] = ($pageDepth * 20) + 10;
             if (isset($pageArray[$identifier . '_'])) {
                 $line['link'] = GeneralUtility::linkThisScript(['id' => $identifier]);
                 $line['icon'] = $this->iconFactory->getIconForRecord('pages', BackendUtility::getRecordWSOL('pages', $identifier), Icon::SIZE_SMALL)->render();
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Private/Language/locallang.xlf b/typo3/sysext/info_pagetsconfig/Resources/Private/Language/locallang.xlf
index e67c8c58b08e0aa4be59a6e937afdb550529d19b..78ed91b265d8f07e398db101d4180dcffc2ba796 100644
--- a/typo3/sysext/info_pagetsconfig/Resources/Private/Language/locallang.xlf
+++ b/typo3/sysext/info_pagetsconfig/Resources/Private/Language/locallang.xlf
@@ -63,6 +63,9 @@
 			<trans-unit id="written_tsconfig_lines">
 				<source>Lines:</source>
 			</trans-unit>
+			<trans-unit id="tsconf_noPageTSconfig">
+				<source>There are no pages containing custom Page TSconfig settings in the page configuration.</source>
+			</trans-unit>
 		</body>
 	</file>
 </xliff>
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/PageZero.html b/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/PageZero.html
index 5ce6e459d18d9bd0cc312713f3429e5fdb6f38ca..fbeafd8f24edddd633fe02ca3cbfe6fca9234c3c 100644
--- a/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/PageZero.html
+++ b/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/PageZero.html
@@ -1,18 +1,25 @@
 <div class="nowrap">
-    <div class="table-fit">
-        <table class="table table-striped table-hover" id="tsconfig-overview">
-            <thead>
-                <tr>
-                    <th>{f:translate(key: 'LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:pagetitle')}</th>
-                    <th>{f:translate(key: 'LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:included_tsconfig_files')}</th>
-                    <th>{f:translate(key: 'LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:written_tsconfig_lines')}</th>
-                </tr>
-            </thead>
-            <tbody>
-                <f:for each="{overviewOfPagesUsingTSConfig}" as="line">
-                    <f:render partial="PageZeroTableRow" arguments="{line: line}" />
-                </f:for>
-            </tbody>
-        </table>
-    </div>
+    <f:if condition="{overviewOfPagesUsingTSConfig}">
+        <f:then>
+            <div class="table-fit">
+                <table class="table table-striped table-hover" id="tsconfig-overview">
+                    <thead>
+                        <tr>
+                            <th>{f:translate(key: 'LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:pagetitle')}</th>
+                            <th>{f:translate(key: 'LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:included_tsconfig_files')}</th>
+                            <th>{f:translate(key: 'LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:written_tsconfig_lines')}</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <f:for each="{overviewOfPagesUsingTSConfig}" as="line">
+                            <f:render partial="PageZeroTableRow" arguments="{line: line}" />
+                        </f:for>
+                    </tbody>
+                </table>
+            </div>
+        </f:then>
+        <f:else>
+            <f:be.infobox message="{f:translate(key: 'LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:tsconf_noPageTSconfig')}" state="-1" />
+        </f:else>
+    </f:if>
 </div>
\ No newline at end of file