diff --git a/src/client/js/objects/objects.js b/src/client/js/objects/objects.js
index cc1e1489..8aa45e84 100644
--- a/src/client/js/objects/objects.js
+++ b/src/client/js/objects/objects.js
@@ -180,7 +180,7 @@ define([
 				}, true);
 			}
 
-			if ((obj.name) && (obj.sprite)) {
+			if (obj.name) {
 				obj.nameSprite = renderer.buildText({
 					layerName: 'effects',
 					text: obj.name,
@@ -361,7 +361,7 @@ define([
 			for (let i = 0; i < oLen; i++) {
 				let obj = objects[i];
 				let ns = obj.nameSprite;
-				if ((!ns) || (obj.dead) || ((obj.sprite) && (!obj.sprite.visible)))
+				if (!ns || obj.dead || (obj.sprite && !obj.sprite.visible) || renderer.isHidden(obj.x, obj.y))
 					continue;
 
 				ns.visible = show;
diff --git a/src/server/config/maps/fjolarok/map.json b/src/server/config/maps/fjolarok/map.json
index 7076ed4c..7288e78e 100644
--- a/src/server/config/maps/fjolarok/map.json
+++ b/src/server/config/maps/fjolarok/map.json
@@ -4043,7 +4043,7 @@
          "y":0
         }],
  "nextlayerid":32,
- "nextobjectid":1022,
+ "nextobjectid":1023,
  "orientation":"orthogonal",
  "properties":[
         {