diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml
index 81127c05eb..5ad7785a51 100755
--- a/Configuration/Settings.yaml
+++ b/Configuration/Settings.yaml
@@ -471,18 +471,13 @@ Neos:
               - Neos\Flow\Persistence\Doctrine\Exception\DatabaseException
               - Neos\Flow\Persistence\Doctrine\Exception\DatabaseConnectionException
               - Neos\Flow\Persistence\Doctrine\Exception\DatabaseStructureException
-            options: &welcomeTemplate
+            options:
               viewClassName: Neos\Fusion\View\FusionView
               viewOptions:
                 fusionPath: 'Neos/Fusion/DatabaseConnectionExceptions'
                 fusionPathPatterns: ['resource://Neos.Neos/Private/Fusion/Error/Root.fusion']
                 enableContentCache: false
                 templatePathAndFilename: ~
-
-          noHomepageException:
-            matchingExceptionClassNames:
-              - Neos\Neos\FrontendRouting\SiteDetection\SiteDetectionFailedException
-            options: *welcomeTemplate
       debugger:
         ignoredClasses:
           Neos\\Neos\\Domain\\Service\\ContentContextFactory: true
diff --git a/Resources/Private/Translations/en/Main.xlf b/Resources/Private/Translations/en/Main.xlf
index 67649a87f3..78c048608d 100644
--- a/Resources/Private/Translations/en/Main.xlf
+++ b/Resources/Private/Translations/en/Main.xlf
@@ -669,16 +669,6 @@
 				<source>Technical Information</source>
 			</trans-unit>
 
-			<trans-unit id="error.exception.noHomepageException.title" xml:space="preserve">
-				<source>Missing Homepage</source>
-			</trans-unit>
-			<trans-unit id="error.exception.noHomepageException.description" xml:space="preserve">
-				<source>Either no site has been defined, the site does not contain a homepage or the active site couldn't be determined.</source>
-			</trans-unit>
-			<trans-unit id="error.exception.noHomepageException.setupMessage" xml:space="preserve">
-				<source>You might want to set the site's domain or import a new site in the setup.</source>
-			</trans-unit>
-
 			<trans-unit id="error.exception.databaseConnectionExceptions.title" xml:space="preserve">
 				<source>Database Error</source>
 			</trans-unit>