diff --git a/memcheck.supp b/memcheck.supp
index f53de143e..d8dad7979 100644
--- a/memcheck.supp
+++ b/memcheck.supp
@@ -1,15 +1,3 @@
-{
-   Motd
-   Memcheck:Cond
-   fun:_ZN7IServer11SendPackMsgI15CNetMsg_Sv_MotdLi0EEEiPT_ii
-   fun:_ZN12CGameContext8SendMotdEi
-   fun:_ZN12CGameContext25ConchainSpecialMotdupdateEPN8IConsole7IResultEPvPFvS2_S3_ES3_
-   fun:_ZN8CConsole9Con_ChainEPN8IConsole7IResultEPv
-   fun:_ZN8CConsole18ExecuteLineStrokedEiPKcib
-   fun:_ZN8CConsole11ExecuteLineEPKcib
-   fun:_ZN8CConsole11ExecuteFileEPKcibi
-   fun:main
-}
 {
    DemoRecorderWrite
    Memcheck:Param
diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp
index 8dcf6e44a..fd4c978f0 100644
--- a/src/engine/server/server.cpp
+++ b/src/engine/server/server.cpp
@@ -723,7 +723,7 @@ int CServer::Port() const
 
 int CServer::MaxClients() const
 {
-	return m_NetServer.MaxClients();
+	return m_RunServer == UNINITIALIZED ? 0 : m_NetServer.MaxClients();
 }
 
 int CServer::ClientCount() const