diff --git a/domain-server/resources/web/js/shared.js b/domain-server/resources/web/js/shared.js
index 4db608ddb4..66159209ea 100644
--- a/domain-server/resources/web/js/shared.js
+++ b/domain-server/resources/web/js/shared.js
@@ -299,6 +299,7 @@ function chooseFromHighFidelityPlaces(accessToken, forcePathTo, onSuccessfullyAd
                     });
                   }
 
+                  // If domainID is not specified, the current domain id will be used.
                   function finishSettingUpPlace(domainID) {
                     sendUpdatePlaceRequest(
                       placeID,
@@ -306,9 +307,9 @@ function chooseFromHighFidelityPlaces(accessToken, forcePathTo, onSuccessfullyAd
                       domainID,
                       false,
                       function(data) {
-                        $(Settings.DOMAIN_ID_SELECTOR).val(domainID).change();
                         dialog.modal('hide')
                         if (domainID) {
+                          $(Settings.DOMAIN_ID_SELECTOR).val(domainID).change();
                           finalizeSaveDomainID(domainID);
                         } else {
                           if (onSuccessfullyAdded) {