diff --git a/src/server/entry.qc b/src/server/entry.qc
index 9890caca..92b95cf0 100644
--- a/src/server/entry.qc
+++ b/src/server/entry.qc
@@ -249,6 +249,9 @@ SV_RunClientCommand(void)
 {
 	NSClient cl = (NSClient)self;
 
+	if (self.classname != "player" && self.classname != "spectator")
+		return;
+
 	if (!Plugin_RunClientCommand()) {
 		/* TODO */
 	}