diff --git a/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java b/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java
index b3b02b47..4317910a 100644
--- a/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java
+++ b/wise-webapp/src/main/java/com/wisemapping/filter/RequestPropertiesInterceptor.java
@@ -48,7 +48,7 @@ public class RequestPropertiesInterceptor implements HandlerInterceptor {
     @Value("${site.homepage}")
     private String siteHomepage;
 
-    @Value("${site.baseurl:http://localhost:8080}")
+    @Value("${site.baseurl}")
     private String siteUrl;
 
     @Value("${security.type}")
diff --git a/wise-webapp/src/main/webapp/WEB-INF/app.properties b/wise-webapp/src/main/webapp/WEB-INF/app.properties
index 3cf6d17c..3a01ea34 100755
--- a/wise-webapp/src/main/webapp/WEB-INF/app.properties
+++ b/wise-webapp/src/main/webapp/WEB-INF/app.properties
@@ -89,7 +89,7 @@ google.recaptcha2.secretKey =  6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe
 admin.user = admin@wisemapping.org
 
 # Base URL where WiseMapping is deployed. By default, It will be automatically inferred.
-site.baseurl = http://localhost:8080
+#site.baseurl = http://localhost:8080
 
 # Site Homepage URL. This will be used as URL for homepage location.
 site.homepage = c/login