diff --git a/core/src/main/java/tc/oc/pgm/community/features/VanishManagerImpl.java b/core/src/main/java/tc/oc/pgm/community/features/VanishManagerImpl.java
index b81ed8b055..ad5abb0cba 100644
--- a/core/src/main/java/tc/oc/pgm/community/features/VanishManagerImpl.java
+++ b/core/src/main/java/tc/oc/pgm/community/features/VanishManagerImpl.java
@@ -96,7 +96,9 @@ public boolean setVanished(MatchPlayer player, boolean vanish, boolean quiet) {
     final Match match = player.getMatch();
 
     // Ensure player is an observer
-    match.setParty(player, match.getDefaultParty());
+    if (vanish && player.getParty() instanceof Competitor) {
+      match.setParty(player, match.getDefaultParty());
+    }
 
     // Set vanish status in match player
     player.setVanished(vanish);