diff --git a/TYPO3.Neos/Classes/TYPO3/Neos/Routing/FrontendNodeRoutePartHandler.php b/TYPO3.Neos/Classes/TYPO3/Neos/Routing/FrontendNodeRoutePartHandler.php
index <HASH>..<HASH> 100644
--- a/TYPO3.Neos/Classes/TYPO3/Neos/Routing/FrontendNodeRoutePartHandler.php
+++ b/TYPO3.Neos/Classes/TYPO3/Neos/Routing/FrontendNodeRoutePartHandler.php
@@ -613,7 +613,7 @@ class FrontendNodeRoutePartHandler extends DynamicRoutePart implements FrontendN
             $uriSegment .= $preset['uriSegment'] . '_';
         }
 
-        if ($allDimensionPresetsAreDefault && $currentNodeIsSiteNode) {
+        if ($this->supportEmptySegmentForDimensions && $allDimensionPresetsAreDefault && $currentNodeIsSiteNode) {
             return '/';
         } else {
             return ltrim(trim($uriSegment, '_') . '/', '/');
BUGFIX: Valid URLs with `supportEmptySegmentForDimensions`

Makes sure that generated URLs observe the setting.

Fixes: #<I>