diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index b2dd8b931e..53cff79e21 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,9 @@ 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/07/12
+	* status_damage will no longer fail when the target is not on a map AND the
+	  flag is 2 (charge rather than damage). Fixes SP-draining status changes
+	  ending suddenly when in-between maps. [Skotlex]
 	* Fixed the IP value being apparently incorrectly casted before inserting
 	  into the loginlog table on "connect success" events. [Skotlex]
 	* Fixed Cart Termination's damage. [Skotlex]
diff --git a/src/map/status.c b/src/map/status.c
index b3a77dadff..fc0fe1ada7 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -523,8 +523,11 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s
 	
 	status = status_get_status_data(target);
 	
-	if (status == &dummy_status || !status->hp || !target->prev)
-		return 0; //Invalid targets: no damage, dead, not on a map.
+	if (status == &dummy_status || !status->hp)
+		return 0; //Invalid targets: no damage or dead
+
+	if (!target->prev && !(flag&2))
+		return 0; //Cannot damage a bl not on a map, except when "charging" hp/sp
 
 	sc = status_get_sc(target);