diff --git a/menu.qc b/menu.qc
index 53556a32..06fad610 100644
--- a/menu.qc
+++ b/menu.qc
@@ -165,7 +165,8 @@ void (float update) Menu_Team = {
     local entity timer;
 
     if (self.classname == "observer")
-        Status_Menu(self, Menu_Team_Input, "");
+        /* Status_Menu(self, Menu_Team_Input, ""); */
+        return;
 
     // allow toggling team menu using any method to show it
     if (!update && self.menu_input == Menu_Team_Input) {
diff --git a/tforthlp.qc b/tforthlp.qc
index 909326f5..829ddff8 100644
--- a/tforthlp.qc
+++ b/tforthlp.qc
@@ -9,6 +9,9 @@ void (float inp) MOTD_Input = {
 };
 
 void () TeamFortress_MOTD = {
+    if (self.classname == "observer")
+        return;
+
     local string st1;
     local string st2;
     local string ya;