diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
index 9d5ba3de5..893420890 100644
--- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
+++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp
@@ -578,7 +578,10 @@ Response::ResponseCode Server_Player::cmdSetCounterActive(const Command_SetCount
     }
 
     const int counterId = cmd.counter_id();
-    if (isCommandZoneCounterBlocked(counterId)) {
+    if (!CounterIds::isTaxCounter(counterId)) {
+        return Response::RespFunctionNotAllowed;
+    }
+    if (!game->getEnableCommandZone()) {
         return Response::RespContextError;
     }
 
diff --git a/libcockatrice_utility/libcockatrice/utility/counter_ids.h b/libcockatrice_utility/libcockatrice/utility/counter_ids.h
index 6745f4487..80571b554 100644
--- a/libcockatrice_utility/libcockatrice/utility/counter_ids.h
+++ b/libcockatrice_utility/libcockatrice/utility/counter_ids.h
@@ -30,6 +30,11 @@ namespace CounterIds
 {
 constexpr int CommanderTax = 8;
 constexpr int PartnerTax = 9;
+
+inline bool isTaxCounter(int id)
+{
+    return id == CommanderTax || id == PartnerTax;
+}
 } // namespace CounterIds
 
 namespace CounterNames