diff --git a/api/src/main/java/net/momirealms/customnameplates/api/AbstractCNPlayer.java b/api/src/main/java/net/momirealms/customnameplates/api/AbstractCNPlayer.java
index 05ad87b..1d8ee38 100644
--- a/api/src/main/java/net/momirealms/customnameplates/api/AbstractCNPlayer.java
+++ b/api/src/main/java/net/momirealms/customnameplates/api/AbstractCNPlayer.java
@@ -206,13 +206,10 @@ public abstract class AbstractCNPlayer implements CNPlayer {
     @Override
     public void addFeature(Feature feature) {
         activeFeatures.add(feature);
-        Set<Placeholder> allPlaceholdersUsedInFeature = feature.allPlaceholders();
-        feature2Placeholders.put(feature, allPlaceholdersUsedInFeature);
-        for (Placeholder placeholder : allPlaceholdersUsedInFeature) {
-            Set<Feature> featureSet = placeholder2Features.computeIfAbsent(placeholder, k -> {
-                forceUpdatePlaceholders(Set.of(placeholder), nearbyPlayers());
-                return new HashSet<>();
-            });
+        Set<Placeholder> allPlaceholders = feature.allPlaceholders();
+        feature2Placeholders.put(feature, allPlaceholders);
+        for (Placeholder placeholder : allPlaceholders) {
+            Set<Feature> featureSet = placeholder2Features.computeIfAbsent(placeholder, k -> new HashSet<>());
             featureSet.add(feature);
         }
     }
diff --git a/backend/src/main/java/net/momirealms/customnameplates/backend/placeholder/PlaceholderManagerImpl.java b/backend/src/main/java/net/momirealms/customnameplates/backend/placeholder/PlaceholderManagerImpl.java
index ff2fc88..13f4762 100644
--- a/backend/src/main/java/net/momirealms/customnameplates/backend/placeholder/PlaceholderManagerImpl.java
+++ b/backend/src/main/java/net/momirealms/customnameplates/backend/placeholder/PlaceholderManagerImpl.java
@@ -171,8 +171,8 @@ public class PlaceholderManagerImpl implements PlaceholderManager {
             String characters = OffsetFont.createOffsets(i);
             this.registerPlayerPlaceholder("%np_offset_" + i + "%", (p) -> AdventureHelper.surroundWithNameplatesFont(characters));
         }
-        this.registerPlayerPlaceholder("%np_equipped_nameplate%", CNPlayer::equippedNameplate);
         if (ConfigManager.nameplateModule()) {
+            this.registerPlayerPlaceholder("%np_equipped_nameplate%", CNPlayer::equippedNameplate);
             this.registerPlayerPlaceholder("%np_equipped_nameplate-name%", (player) -> {
                 Nameplate nameplate = plugin.getNameplateManager().nameplateById(player.equippedNameplate());
                 return Optional.ofNullable(nameplate).map(Nameplate::displayName).orElse("");
diff --git a/gradle.properties b/gradle.properties
index 1b37143..9f48d4a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 # Project settings
 # Rule: [major update].[feature update].[bug fix]
-project_version=3.0.0-beta-4
+project_version=3.0.0-beta-5
 config_version=37
 project_group=net.momirealms