diff --git a/domain-server/resources/web/js/shared.js b/domain-server/resources/web/js/shared.js
index f5346ce024..69721ee924 100644
--- a/domain-server/resources/web/js/shared.js
+++ b/domain-server/resources/web/js/shared.js
@@ -164,11 +164,12 @@ function getDomainFromAPI(callback) {
   if (callback === undefined) {
     callback = function() {};
   }
-
-  var domainID = Settings.data.values.metaverse.id;
-  if (domainID === null || domainID === undefined || domainID === '') {
+  
+  if (!domainIDIsSet()) {
     callback({ status: 'fail' });
     return null;
+  } else {
+    var domainID = Settings.data.values.metaverse.id;
   }
 
   pendingDomainRequest = $.ajax({
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index b8d4a07238..8febbd5769 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -1162,7 +1162,7 @@ bool DomainServerSettingsManager::handleAuthenticatedHTTPRequest(HTTPConnection
             // and exclude default values
             rootObject[SETTINGS_RESPONSE_VALUE_KEY] = settingsResponseObjectForType("", true,
                                                                                     forDomainSettings, forContentSettings,
-                                                                                    false);
+                                                                                    true);
 
             connection->respond(HTTPConnection::StatusCode200, QJsonDocument(rootObject).toJson(), "application/json");