diff --git a/Minecraft.Server/FourKitNatives.cpp b/Minecraft.Server/FourKitNatives.cpp
index 4f5c3af02..d9eceda88 100644
--- a/Minecraft.Server/FourKitNatives.cpp
+++ b/Minecraft.Server/FourKitNatives.cpp
@@ -740,8 +740,8 @@ void __cdecl NativeGetContainerViewerEntityIds(int entityId, int *outIds, int ma
 void __cdecl NativeCloseContainer(int entityId)
 {
     auto player = FindPlayer(entityId);
-    if (player)
-        player->doCloseContainer();
+    if (player && player->containerMenu != player->inventoryMenu)
+        player->closeContainer();
 }
 
 void __cdecl NativeOpenVirtualContainer(int entityId, int nativeType, const char *titleUtf8, int titleByteLen, int slotCount, int *itemsBuf)
@@ -751,7 +751,7 @@ void __cdecl NativeOpenVirtualContainer(int entityId, int nativeType, const char
         return;
 
     if (player->containerMenu != player->inventoryMenu)
-        player->doCloseContainer();
+        player->closeContainer();
 
     std::wstring title = ServerRuntime::StringUtils::Utf8ToWide(std::string(titleUtf8, titleByteLen));
     auto container = std::make_shared<VirtualContainer>(nativeType, title, slotCount);