diff --git a/regamedll/dlls/player.cpp b/regamedll/dlls/player.cpp
index aa3b1109..651b695e 100644
--- a/regamedll/dlls/player.cpp
+++ b/regamedll/dlls/player.cpp
@@ -5646,6 +5646,11 @@ NOXREF void CBasePlayer::SelectNextItem(int iItem)
 		return;
 	}
 
+#ifdef REGAMEDLL_FIXES
+	if (m_pActiveItem && !m_pActiveItem->CanHolster())
+		return;
+#endif
+
 	if (pItem == m_pActiveItem)
 	{
 		pItem = m_pActiveItem->m_pNext;
@@ -5697,6 +5702,11 @@ void CBasePlayer::SelectItem(const char *pstr)
 		return;
 	}
 
+#ifdef REGAMEDLL_FIXES
+	if (m_pActiveItem && !m_pActiveItem->CanHolster())
+		return;
+#endif
+
 	auto pItem = GetItemByName(pstr);
 	if (!pItem || pItem == m_pActiveItem)
 		return;