diff --git a/source/game.cpp b/source/game.cpp
index 2e66d065..8fbbd78f 100644
--- a/source/game.cpp
+++ b/source/game.cpp
@@ -198,8 +198,10 @@ void Game::checkPlayerOnBorder()
 {
 	if (mPlayer->getOnBorder())
 	{
-		changeRoom(mRoom->getRoom(mPlayer->getBorder()));
-		mPlayer->switchBorders();
+		if (changeRoom(mRoom->getRoom(mPlayer->getBorder())))
+		{
+			mPlayer->switchBorders();
+		}
 	}
 }