diff --git a/src/game/boe.specials.cpp b/src/game/boe.specials.cpp
index fb141064..f600116b 100644
--- a/src/game/boe.specials.cpp
+++ b/src/game/boe.specials.cpp
@@ -1329,6 +1329,7 @@ void teleport_party(short x,short y,short mode) {
 	// TODO: Teleport sound? (Sound 10)
 	location l;
 	bool fadeIn = false, fadeOut = false;
+	if(is_combat()) mode = 1;
 	if(mode == 0 || mode == 2) fadeOut = true;
 	if(mode == 0 || mode == 3) fadeIn = true;
 	
@@ -1336,9 +1337,6 @@ void teleport_party(short x,short y,short mode) {
 	for(int i = 0; i < 6; i++)
 		univ.party[i].status[eStatus::FORCECAGE] = 0;
 	
-	if(is_combat())
-		mode = 1;
-	
 	l = univ.party.town_loc;
 	update_explored(l);