diff --git a/CREDITS.md b/CREDITS.md
index 8a2c955b1e..5b81d47fe9 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -529,6 +529,7 @@ This page lists all the individual contributions to the project by their author.
   - Fix a bug where passengers created by the InitialPayload logic or TeamType with `Full=true` would fail to fire when the transport unit with `OpenTopped=yes` moved to an area that the passengers' `MovementZone` cannot move into
   - Fix a bug where game will crash after loading if a techno with `AlphaImage` converts to a type without it, or an anim with `AlphaImage` changes to a type without it through `Next`
   - Fix a bug where updating the `OpenTopped` attribute during convert did not update the coordinates of passengers
+  - Fix the issue that `NoQueueUpToEnter` will clear passenger's planning tokens when entered transport
 - **Apollo** - Translucent SHP drawing patches
 - **ststl**:
   - Customizable `ShowTimer` priority of superweapons
diff --git a/docs/Whats-New.md b/docs/Whats-New.md
index 2e4916855f..244af8dc0d 100644
--- a/docs/Whats-New.md
+++ b/docs/Whats-New.md
@@ -694,6 +694,7 @@ Phobos fixes:
 - Fixed combat light ignoring / behaving differently from vanilla game regarding detail level and framerate checks (by Starkku)
 - Fixed a bug causing transfering AttachEffects (e.g on `DeploysInto`/`UndeploysInto`) not to immediately recalculate stats or tint (by Starkku)
 - Fixed a bug where updating the `OpenTopped` attribute during convert did not update the coordinates of passengers (by NetsuNegi)
+- Fixed the issue that `NoQueueUpToEnter` will clear passenger's planning tokens when entered transport (by NetsuNegi)
 
 Fixes / interactions with other extensions:
 <!--  - Allowed `AuxBuilding` and Ares' `SW.Aux/NegBuildings` to count building upgrades (by Ollerus)  -->
diff --git a/docs/locale/zh_CN/LC_MESSAGES/CREDITS.po b/docs/locale/zh_CN/LC_MESSAGES/CREDITS.po
index d24f9f8562..c538694a8e 100644
--- a/docs/locale/zh_CN/LC_MESSAGES/CREDITS.po
+++ b/docs/locale/zh_CN/LC_MESSAGES/CREDITS.po
@@ -1747,6 +1747,12 @@ msgid ""
 msgstr ""
 "修复了类型转换会更新 `OpenTopped` 属性却不更新乘客坐标的 Bug"
 
+msgid ""
+"Fix the issue that `NoQueueUpToEnter` will clear passenger's "
+"planning tokens when entered transport"
+msgstr ""
+"修复了 `NoQueueUpToEnter` 会在乘客进入载具时清除计划节点的问题"
+
 msgid "**Apollo** - Translucent SHP drawing patches"
 msgstr "**Apollo** - 半透明 SHP 绘制补丁"
 
diff --git a/docs/locale/zh_CN/LC_MESSAGES/Whats-New.po b/docs/locale/zh_CN/LC_MESSAGES/Whats-New.po
index b65928b324..4724d24932 100644
--- a/docs/locale/zh_CN/LC_MESSAGES/Whats-New.po
+++ b/docs/locale/zh_CN/LC_MESSAGES/Whats-New.po
@@ -2496,6 +2496,12 @@ msgid ""
 msgstr ""
 "修复了类型转换会更新 `OpenTopped` 属性却不更新乘客坐标的 Bug（by NetsuNegi）"
 
+msgid ""
+"Fixed the issue that `NoQueueUpToEnter` will clear passenger's "
+"planning tokens when entered transport (by NetsuNegi)"
+msgstr ""
+"修复了 `NoQueueUpToEnter` 会在乘客进入载具时清除计划节点的问题（by NetsuNegi）"
+
 msgid "Fixes / interactions with other extensions:"
 msgstr "其他扩展引擎相关的修复／交互："
 
diff --git a/src/Ext/Techno/Hooks.Transport.cpp b/src/Ext/Techno/Hooks.Transport.cpp
index 8416ebf863..5648b7e79e 100644
--- a/src/Ext/Techno/Hooks.Transport.cpp
+++ b/src/Ext/Techno/Hooks.Transport.cpp
@@ -293,7 +293,7 @@ static inline void DoEnterNow(UnitClass* pTransport, FootClass* pPassenger, Tech
 	pPassenger->OnBridge = false; // Don't swap order casually, important
 	pPassenger->NextObject = nullptr; // Don't swap order casually, very important
 
-	pPassenger->SetDestination(nullptr, true); // Added, to prevent passengers from return to board position when survive
+	//pPassenger->SetDestination(nullptr, true); // Added, to prevent passengers from return to board position when survive
 	pPassenger->QueueUpToEnter = nullptr; // Added, to prevent passengers from wanting to get on after getting off
 	pPassenger->FrozenStill = true; // Added, to prevent the vehicles from stacking together when unloading
 	pPassenger->SetSpeedPercentage(0.0); // Added, to stop the passengers and let OpenTopped work normally