diff --git a/dist-persist/wbstack/src/Settings/LocalSettings.php b/dist-persist/wbstack/src/Settings/LocalSettings.php
index b709a6aea..d4499b4da 100644
--- a/dist-persist/wbstack/src/Settings/LocalSettings.php
+++ b/dist-persist/wbstack/src/Settings/LocalSettings.php
@@ -92,11 +92,14 @@
 
 if ( $wwDomainSaysLocal ) {
     $wgServer = "http://" . $wikiInfo->domain;
+
+    if ( $_SERVER['SERVER_PORT'] !== 80 ) {
+        $wgServer .= ":" . $_SERVER['SERVER_PORT'];
+    }
 } else {
     $wgServer = "https://" . $wikiInfo->domain;
 }
 
-
 $wgScriptPath = "/w";
 $wgArticlePath = "/wiki/$1";
 
@@ -508,7 +511,7 @@ function onPersonalUrlsConfirmAccount( array &$personal_urls, Title $title, Skin
 $wgWBClientSettings['repoUrl'] = $GLOBALS['wgServer'];
 $wgWBClientSettings['repoSiteName'] = $GLOBALS['wgSitename'];
 
-$localConceptBaseUri = 'https://' . $wikiInfo->domain . '/entity/';
+$localConceptBaseUri = $wgServer . '/entity/';
 
 $wgWBRepoSettings['entitySources'] = [
     'local' => 
diff --git a/dist/wbstack/src/Settings/LocalSettings.php b/dist/wbstack/src/Settings/LocalSettings.php
index b709a6aea..d4499b4da 100644
--- a/dist/wbstack/src/Settings/LocalSettings.php
+++ b/dist/wbstack/src/Settings/LocalSettings.php
@@ -92,11 +92,14 @@
 
 if ( $wwDomainSaysLocal ) {
     $wgServer = "http://" . $wikiInfo->domain;
+
+    if ( $_SERVER['SERVER_PORT'] !== 80 ) {
+        $wgServer .= ":" . $_SERVER['SERVER_PORT'];
+    }
 } else {
     $wgServer = "https://" . $wikiInfo->domain;
 }
 
-
 $wgScriptPath = "/w";
 $wgArticlePath = "/wiki/$1";
 
@@ -508,7 +511,7 @@ function onPersonalUrlsConfirmAccount( array &$personal_urls, Title $title, Skin
 $wgWBClientSettings['repoUrl'] = $GLOBALS['wgServer'];
 $wgWBClientSettings['repoSiteName'] = $GLOBALS['wgSitename'];
 
-$localConceptBaseUri = 'https://' . $wikiInfo->domain . '/entity/';
+$localConceptBaseUri = $wgServer . '/entity/';
 
 $wgWBRepoSettings['entitySources'] = [
     'local' =>