diff --git a/twe/js/map.js b/twe/js/map.js
index 0ce6c413..9fda0ab5 100644
--- a/twe/js/map.js
+++ b/twe/js/map.js
@@ -215,12 +215,15 @@ function reloadWorldMap(option){
             if(id in spyList){
                 clickable |= spyList[id] << 3;
             }
-            if(nationId == myNation){
+            if(myNation !== null && nationId == myNation){
                 clickable |= 4;
             }
             if(shownByGeneralList.hasOwnProperty(id)){
                 clickable |= 2;
             }
+            if(myCity !== null && id == myCity){
+                clickable |= 2;
+            }
             if(clickableAll){
                 clickable |= 1;
             }