diff --git a/bukkit/src/main/java/com/griefdefender/permission/GDPermissionManager.java b/bukkit/src/main/java/com/griefdefender/permission/GDPermissionManager.java
index 3edfee0..15f90c8 100644
--- a/bukkit/src/main/java/com/griefdefender/permission/GDPermissionManager.java
+++ b/bukkit/src/main/java/com/griefdefender/permission/GDPermissionManager.java
@@ -239,7 +239,7 @@ public Tristate getFinalPermission(Event event, Location location, Set<Context>
 
         if (flag == Flags.ENTITY_SPAWN) {
             // Check spawn limit
-            final int spawnLimit = GDPermissionManager.getInstance().getInternalOptionValue(TypeToken.of(Integer.class), GriefDefenderPlugin.DEFAULT_HOLDER, Options.SPAWN_LIMIT, claim, contexts);
+            final int spawnLimit = GDPermissionManager.getInstance().getInternalOptionValue(TypeToken.of(Integer.class), GriefDefenderPlugin.DEFAULT_HOLDER, Options.SPAWN_LIMIT, claim, new HashSet<>(contexts));
             if (spawnLimit > -1) {
                 if (target instanceof Entity) {
                     final Entity entity = (Entity) target;
diff --git a/bukkit/src/main/java/com/griefdefender/provider/LuckPermsProvider.java b/bukkit/src/main/java/com/griefdefender/provider/LuckPermsProvider.java
index 3b0b884..84a0e14 100644
--- a/bukkit/src/main/java/com/griefdefender/provider/LuckPermsProvider.java
+++ b/bukkit/src/main/java/com/griefdefender/provider/LuckPermsProvider.java
@@ -579,7 +579,6 @@ public Tristate getPermissionValue(GDClaim claim, GDPermissionHolder holder, Str
     }
 
     public Tristate getPermissionValue(GDClaim claim, GDPermissionHolder holder, String permission, Set<Context> contexts) {
-        this.addActiveContexts(contexts, holder, null, claim);
         this.checkServerContext(contexts);
         ImmutableContextSet contextSet = this.getLPContexts(contexts).immutableCopy();
         return this.getPermissionValue(holder, permission, contextSet);
@@ -692,7 +691,6 @@ public Tristate getPermissionValueWithRequiredContexts(GDClaim claim, GDPermissi
     }
 
     public Tristate getPermissionValue(GDPermissionHolder holder, String permission, Set<Context> contexts) {
-        this.addActiveContexts(contexts, holder, null, null);
         this.checkServerContext(contexts);
         ImmutableContextSet contextSet = this.getLPContexts(contexts).immutableCopy();
         return this.getPermissionValue(holder, permission, contextSet);
diff --git a/sponge/src/main/java/com/griefdefender/permission/GDPermissionManager.java b/sponge/src/main/java/com/griefdefender/permission/GDPermissionManager.java
index 5b53532..f58980e 100644
--- a/sponge/src/main/java/com/griefdefender/permission/GDPermissionManager.java
+++ b/sponge/src/main/java/com/griefdefender/permission/GDPermissionManager.java
@@ -284,7 +284,7 @@ public Tristate getFinalPermission(Event event, Location<World> location, Set<Co
 
         if (flag == Flags.ENTITY_SPAWN) {
             // Check spawn limit
-            final int spawnLimit = GDPermissionManager.getInstance().getInternalOptionValue(TypeToken.of(Integer.class), GriefDefenderPlugin.DEFAULT_HOLDER, Options.SPAWN_LIMIT, claim, contexts);
+            final int spawnLimit = GDPermissionManager.getInstance().getInternalOptionValue(TypeToken.of(Integer.class), GriefDefenderPlugin.DEFAULT_HOLDER, Options.SPAWN_LIMIT, claim, new HashSet<>(contexts));
             if (spawnLimit > -1) {
                 if (target instanceof Entity) {
                     final Entity entity = (Entity) target;
diff --git a/sponge/src/main/java/com/griefdefender/provider/LuckPermsProvider.java b/sponge/src/main/java/com/griefdefender/provider/LuckPermsProvider.java
index 7cda5fb..8520239 100644
--- a/sponge/src/main/java/com/griefdefender/provider/LuckPermsProvider.java
+++ b/sponge/src/main/java/com/griefdefender/provider/LuckPermsProvider.java
@@ -575,7 +575,6 @@ public Tristate getPermissionValue(GDClaim claim, GDPermissionHolder holder, Str
     }
 
     public Tristate getPermissionValue(GDClaim claim, GDPermissionHolder holder, String permission, Set<Context> contexts) {
-        this.addActiveContexts(contexts, holder, null, claim);
         this.checkServerContext(contexts);
         ImmutableContextSet contextSet = this.getLPContexts(contexts).immutableCopy();
         return this.getPermissionValue(holder, permission, contextSet);
@@ -688,7 +687,6 @@ public Tristate getPermissionValueWithRequiredContexts(GDClaim claim, GDPermissi
     }
 
     public Tristate getPermissionValue(GDPermissionHolder holder, String permission, Set<Context> contexts) {
-        this.addActiveContexts(contexts, holder, null, null);
         this.checkServerContext(contexts);
         ImmutableContextSet contextSet = this.getLPContexts(contexts).immutableCopy();
         return this.getPermissionValue(holder, permission, contextSet);