diff --git a/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java b/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java
index a9480bc40..86e5f76ad 100644
--- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java
@@ -55,11 +55,10 @@ private static GameProfile getProfile( @Nullable GameProfile profile )
 
     private void setState( ITurtleAccess turtle )
     {
-        if( openContainer != null )
+        if( openContainer != container )
         {
             ComputerCraft.log.warn( "Turtle has open container ({})", openContainer );
-            openContainer.onContainerClosed( this );
-            openContainer = null;
+            closeContainer();
         }
 
         BlockPos position = turtle.getPosition();