diff --git a/game/modules/tome/class/Party.lua b/game/modules/tome/class/Party.lua
index b2d1222d90df01a5beb7268578d7c938d1a0d9fc..57733f82944bc3112dfe45490682fba7bf684e42 100644
--- a/game/modules/tome/class/Party.lua
+++ b/game/modules/tome/class/Party.lua
@@ -200,6 +200,10 @@ function _M:setPlayer(actor, bypass)
 
 	if actor == game.player then return true end
 
+	-- Stop!!
+	if game.player.runStop then game.player:runStop("Switching control") end
+	if game.player.restStop then game.player:restStop("Switching control") end
+
 	local def = self.members[actor]
 	local oldp = self.player
 	self.player = actor