diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 75c56c97a3..c496c84c5a 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,9 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2006/07/04
+	* Added a check when joining a chat to make sure the target object is of
+	  type BL_CHAT. [Skotlex]
 2006/07/03
 	* Cleared up the bAutoSpellWhenHit description in doc/item_bonus.txt
 	  [Skotelx]
diff --git a/src/map/chat.c b/src/map/chat.c
index 5a62352239..d031a446bf 100644
--- a/src/map/chat.c
+++ b/src/map/chat.c
@@ -81,7 +81,7 @@ int chat_joinchat (struct map_session_data *sd, int chatid, char* pass)
  //a wrong chat id can be received. [Skotlex]
 	if (cd == NULL)
 		return 1;
-	if (cd->bl.m != sd->bl.m || sd->vender_id || sd->chatID || cd->limit <= cd->users) {
+	if (cd->bl.type != BL_CHAT || cd->bl.m != sd->bl.m || sd->vender_id || sd->chatID || cd->limit <= cd->users) {
 		clif_joinchatfail(sd,0);
 		return 0;
 	}