diff --git a/api/src/main/java/net/momirealms/customnameplates/api/CustomNameplatesAPI.java b/api/src/main/java/net/momirealms/customnameplates/api/CustomNameplatesAPI.java
index 4ddf443..cc5b6c3 100644
--- a/api/src/main/java/net/momirealms/customnameplates/api/CustomNameplatesAPI.java
+++ b/api/src/main/java/net/momirealms/customnameplates/api/CustomNameplatesAPI.java
@@ -34,13 +34,13 @@ import java.util.UUID;
  * CustomNameplatesAPI
  */
 public record CustomNameplatesAPI(CustomNameplates plugin) {
+    private static CustomNameplatesAPI instance;
+
     public CustomNameplatesAPI(CustomNameplates plugin) {
         this.plugin = plugin;
         instance = this;
     }
 
-    private static CustomNameplatesAPI instance;
-
     /**
      * Gets the CustomNameplates plugin instance.
      *
diff --git a/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitPlatform.java b/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitPlatform.java
index 0a24cae..4473130 100644
--- a/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitPlatform.java
+++ b/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitPlatform.java
@@ -424,6 +424,10 @@ public class BukkitPlatform implements Platform {
                                     if (p == null) {
                                         return;
                                     }
+                                    // do not hide team name for the viewer
+                                    if (player.name().equals(entity)) {
+                                        return;
+                                    }
                                 }
                             }
                         }
@@ -451,6 +455,9 @@ public class BukkitPlatform implements Platform {
                                     if (p == null) {
                                         return;
                                     }
+                                    if (player.name().equals(entity)) {
+                                        return;
+                                    }
                                 }
                             }
                         }