diff --git a/ConnectAnnounce/scripting/ConnectAnnounce.sp b/ConnectAnnounce/scripting/ConnectAnnounce.sp
index 49e8e355..1d4190de 100644
--- a/ConnectAnnounce/scripting/ConnectAnnounce.sp
+++ b/ConnectAnnounce/scripting/ConnectAnnounce.sp
@@ -449,7 +449,10 @@ public void TQueryCB(Handle owner, Handle rs, const char[] error, any data)
 				if(!g_bHideCsays[i] && IsClientInGame(i))
 				{
 					CRemoveTags(sCustomMessage, 256);
-					PrintCenterText(i, "%s %s %s %s", "[VIP]", sName, "connected", sCustomMessage);
+					if(StrContains(sCustomMessage, "") == -1)
+						PrintCenterText(i, "%s %s %s %s", "[VIP]", sName, "connected", sCustomMessage);
+					else
+						PrintCenterText(i, "%s %s %s", "[VIP]", sName, "connected");
 				}
 			}
 		}