diff --git a/src/client/graphics/layers/NameLayer.ts b/src/client/graphics/layers/NameLayer.ts
index 21334b02c..0548f6fd8 100644
--- a/src/client/graphics/layers/NameLayer.ts
+++ b/src/client/graphics/layers/NameLayer.ts
@@ -139,8 +139,14 @@ export class NameLayer implements Layer {
     const isOnScreen = render.location
       ? this.transformHandler.isOnScreen(render.location)
       : false;
+    const maxZoomScale = 17;
 
-    if (!this.isVisible || size < 7 || !isOnScreen) {
+    if (
+      !this.isVisible ||
+      size < 7 ||
+      (this.transformHandler.scale > maxZoomScale && size > 100) ||
+      !isOnScreen
+    ) {
       render.element.style.display = "none";
     } else {
       render.element.style.display = "flex";