diff --git a/application/core/Players/PlayerActions.php b/application/core/Players/PlayerActions.php
index 75cdbb12..0eb3ae96 100644
--- a/application/core/Players/PlayerActions.php
+++ b/application/core/Players/PlayerActions.php
@@ -164,7 +164,7 @@ class PlayerActions {
 		}
 		$target = $this->maniaControl->playerManager->getPlayer($targetLogin);
 
-		if (!$admin || !$target) {
+		if (!$admin || !$target || $target->isSpectator) {
 			return;
 		}
 
diff --git a/application/plugins/ChatMessagePlugin.php b/application/plugins/ChatMessagePlugin.php
index f72b3802..a537d387 100644
--- a/application/plugins/ChatMessagePlugin.php
+++ b/application/plugins/ChatMessagePlugin.php
@@ -352,6 +352,10 @@ class ChatMessagePlugin implements CommandListener, Plugin {
 		$this->maniaControl->chat->sendChat($msg, null, false);
 
 		if ($this->maniaControl->settingManager->getSetting($this, self::SETTING_AFK_FORCE_SPEC)) {
+			if($player->isSpectator){
+				return;
+			}
+
 			// force into spec
 			try {
 				$this->maniaControl->client->forceSpectator($player->login, 3);