diff --git a/lib/Controller/NavigationController.php b/lib/Controller/NavigationController.php
index b613fb1e..8c27aa59 100644
--- a/lib/Controller/NavigationController.php
+++ b/lib/Controller/NavigationController.php
@@ -132,6 +132,7 @@ class NavigationController extends Controller {
 	 *
 	 * @return TemplateResponse
 	 * @throws UrlCloudException
+	 * @throws SocialAppConfigException
 	 */
 	public function navigate(string $path = ''): TemplateResponse {
 		$data = [
@@ -169,7 +170,7 @@ class NavigationController extends Controller {
 		try {
 			$this->configService->getSocialUrl();
 		} catch (SocialAppConfigException $e) {
-			$this->configService->setSocialUrl('');
+			$this->configService->setSocialUrl();
 		}
 
 		if ($data['serverData']['isAdmin']) {
diff --git a/lib/Service/ConfigService.php b/lib/Service/ConfigService.php
index 267deca7..515521f4 100644
--- a/lib/Service/ConfigService.php
+++ b/lib/Service/ConfigService.php
@@ -379,7 +379,7 @@ class ConfigService {
 	 */
 	public function setSocialUrl(string $url = '') {
 		if ($url === '') {
-			$url = $this->getCloudUrl() . $this->urlGenerator->linkToRoute(
+			$url = $this->getCloudUrl(true) . $this->urlGenerator->linkToRoute(
 					'social.Navigation.navigate'
 				);
 		}