diff --git a/src/game/char_battle.cpp b/src/game/char_battle.cpp
index 8161ddb..9dfbaef 100644
--- a/src/game/char_battle.cpp
+++ b/src/game/char_battle.cpp
@@ -1660,10 +1660,10 @@ void CHARACTER::EnterCombat()
 		SetPosition(POS_FIGHTING);
 
 	// MR-3: Cancel logout on use skill
-	if (IsCmdCountdownActive())
+	if (m_pkTimedEvent)
 	{
 		ChatPacket(CHAT_TYPE_INFO, LC_TEXT("전투가 시작 되어 취소 되었습니다."));
-		CancelCmdCountdown();
+		event_cancel(&m_pkTimedEvent);
 	}
 	// MR-3: -- END OF -- Cancel logout on use skill