diff --git a/src/map/pc.cpp b/src/map/pc.cpp
index f67cd39eb62..9d04474852e 100755
--- a/src/map/pc.cpp
+++ b/src/map/pc.cpp
@@ -1926,6 +1926,11 @@ bool pc_lastpoint_special( map_session_data& sd ){
 		return true;
 	}
 
+	if (strcmpi(sd.status.last_point.map, MAP_JAIL) == 0) {
+		// Don't return jailed player to save point.
+		return false;
+	}
+
 	// Maybe since the player's logout the nosave mapflag was added to the map
 	if( mapdata->getMapFlag(MF_NOSAVE) ){
 		// The map has a specific return point