diff --git a/source/server/Client.cpp b/source/server/Client.cpp
index 4457ef0..c047fdd 100644
--- a/source/server/Client.cpp
+++ b/source/server/Client.cpp
@@ -622,7 +622,7 @@ void Client::sendTagInfPacket() {
 
     packet->mUserID = sInstance->mUserID;
 
-    packet->isIt = hsMode->isPlayerIt();
+    packet->isIt = hsMode->isPlayerIt() && hsMode->isModeActive();
 
     packet->minutes = curInfo->mHidingTime.mMinutes;
     packet->seconds = curInfo->mHidingTime.mSeconds;
diff --git a/source/server/hns/HideAndSeekMode.cpp b/source/server/hns/HideAndSeekMode.cpp
index 65e97c0..9efbdaf 100644
--- a/source/server/hns/HideAndSeekMode.cpp
+++ b/source/server/hns/HideAndSeekMode.cpp
@@ -84,6 +84,8 @@ void HideAndSeekMode::begin() {
         playGuideLyt->end();
 
     GameModeBase::begin();
+
+    Client::sendTagInfPacket();
 }
 
 void HideAndSeekMode::end() {
@@ -109,6 +111,8 @@ void HideAndSeekMode::end() {
         playGuideLyt->appear();
 
     GameModeBase::end();
+
+    Client::sendTagInfPacket();
 }
 
 void HideAndSeekMode::update() {