diff --git a/core/Controller/RecommendedAppsController.php b/core/Controller/RecommendedAppsController.php
index 1b6650ed902..b38aaa31fca 100644
--- a/core/Controller/RecommendedAppsController.php
+++ b/core/Controller/RecommendedAppsController.php
@@ -30,15 +30,20 @@ use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Http\StandaloneTemplateResponse;
 use OCP\IInitialStateService;
 use OCP\IRequest;
+use OCP\IURLGenerator;
 
 class RecommendedAppsController extends Controller {
 
+	/** @var IURLGenerator */
+	public $urlGenerator;
 	/** @var IInitialStateService */
 	private $initialStateService;
 
 	public function __construct(IRequest $request,
+								IURLGenerator $urlGenerator,
 								IInitialStateService $initialStateService) {
 		parent::__construct('core', $request);
+		$this->urlGenerator = $urlGenerator;
 		$this->initialStateService = $initialStateService;
 	}
 
@@ -47,7 +52,8 @@ class RecommendedAppsController extends Controller {
 	 * @return Response
 	 */
 	public function index(): Response {
-		$this->initialStateService->provideInitialState('core', 'defaultPageUrl', \OC_Util::getDefaultPageUrl());
+		$defaultPageUrl = $this->urlGenerator->linkToDefaultPageUrl();
+		$this->initialStateService->provideInitialState('core', 'defaultPageUrl', $defaultPageUrl);
 		return new StandaloneTemplateResponse($this->appName, 'recommendedapps', [], 'guest');
 	}
 }
diff --git a/core/Controller/SetupController.php b/core/Controller/SetupController.php
index 704a2507b5a..c89709012d1 100644
--- a/core/Controller/SetupController.php
+++ b/core/Controller/SetupController.php
@@ -119,12 +119,12 @@ class SetupController {
 		}
 
 		if ($installRecommended) {
-			$urlGenerator = \OC::$server->getURLGenerator();
-			$location = $urlGenerator->getAbsoluteURL('index.php/core/apps/recommended');
-			header('Location: ' . $location);
+			header('Location: ' . \OC::$server->getURLGenerator()->getAbsoluteURL('index.php/core/apps/recommended'));
+			exit();
+		} else {
+			header('Location: ' . \OC::$server->getURLGenerator()->linkToDefaultPageUrl());
 			exit();
 		}
-		\OC_Util::redirectToDefaultPage();
 	}
 
 	public function loadAutoConfig($post) {
diff --git a/lib/base.php b/lib/base.php
index 45d06da0303..94610576fce 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -1021,12 +1021,10 @@ class OC {
 			OC_App::loadApps();
 			OC_User::setupBackends();
 			OC_Util::setupFS();
-			// FIXME
-			// Redirect to default application
-			OC_Util::redirectToDefaultPage();
+			header('Location: ' . \OC::$server->getURLGenerator()->linkToDefaultPageUrl());
 		} else {
 			// Not handled and not logged in
-			header('Location: '.\OC::$server->getURLGenerator()->linkToRouteAbsolute('core.login.showLoginForm'));
+			header('Location: ' . \OC::$server->getURLGenerator()->linkToRouteAbsolute('core.login.showLoginForm'));
 		}
 	}