diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index accbe46a30..5470fbf73e 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/04/17
+	* Fixed pet being incorrectly removed when it had intimacy 0. [Skotlex]
 	* Some cleanup in the TK_RUN related code. [Skotlex]
 	* Added variable walk_count to unit_data to be use as a counter for cells
 	  walked for walk-triggered skills, on-chase skill triggers are now done
diff --git a/src/map/clif.c b/src/map/clif.c
index a295e68a9c..18b09da95d 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8044,7 +8044,7 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
 		clif_set0199(fd,3);
 
 	// pet
-	if(sd->status.pet_id > 0 && sd->pd && sd->pet.intimate > 0) {
+	if(sd->status.pet_id > 0 && sd->pd) {
 		map_addblock(&sd->pd->bl);
 		clif_spawn(&sd->pd->bl);
 		clif_send_petdata(sd,0,0);
diff --git a/src/map/unit.c b/src/map/unit.c
index c8e3738b68..61420d43e4 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -1606,7 +1606,7 @@ int unit_remove_map(struct block_list *bl, int clrtype) {
 			map_freeblock_unlock();
 			return 0;
 		}
-		if (sd->bl.m != bl->m && sd->pet.intimate <= 0)
+		if (sd->pet.intimate <= 0)
 		{	//Remove pet.
 			intif_delete_petdata(sd->status.pet_id);
 			sd->status.pet_id = 0;