diff --git a/src/map/map.c b/src/map/map.c
index f8acd38a29..838055d411 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1709,7 +1709,7 @@ int map_quit(struct map_session_data *sd) {
 		unit_remove_map(&sd->ed->bl,CLR_TELEPORT);
 	}
 
-	unit_remove_map_pc(sd,CLR_TELEPORT);
+	unit_remove_map_pc(sd,CLR_RESPAWN);
 
 	if( map[sd->bl.m].instance_id ) { // Avoid map conflicts and warnings on next login
 		int16 m;
diff --git a/src/map/mob.c b/src/map/mob.c
index 3218fe4c66..69ed2f8a06 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2815,7 +2815,7 @@ int mob_warpslave_sub(struct block_list *bl,va_list ap)
 		return 0;
 
 	map_search_freecell(master, 0, &x, &y, range, range, 0);
-	unit_warp(&md->bl, master->m, x, y,CLR_RESPAWN);
+	unit_warp(&md->bl, master->m, x, y,CLR_TELEPORT);
 	return 1;
 }