diff --git a/omod/src/main/webapp/resources/scripts/field/personAddressWithHierarchy.js b/omod/src/main/webapp/resources/scripts/field/personAddressWithHierarchy.js
index f9fd7dc8..4faad3a2 100644
--- a/omod/src/main/webapp/resources/scripts/field/personAddressWithHierarchy.js
+++ b/omod/src/main/webapp/resources/scripts/field/personAddressWithHierarchy.js
@@ -322,6 +322,8 @@ function PersonAddressWithHierarchy(personAddressWithHierarchy) {
 
             // go to the first level we didn't just set
             var goToLevel = firstLevelNotIncluded(ui.item.data);
+            //this will disable next mandatory levels if no entries are configured in the system
+            preloadLevels(goToLevel);
 
             // if we are using the simple UI navigator, use the NavigatorController so that the simple for UI keeps up
             if (typeof(NavigatorController) != 'undefined') {