diff --git a/com.unity.netcode.gameobjects/Runtime/Components/Helpers/AttachableBehaviour.cs b/com.unity.netcode.gameobjects/Runtime/Components/Helpers/AttachableBehaviour.cs
index 14c72673a3..9f97ca7bca 100644
--- a/com.unity.netcode.gameobjects/Runtime/Components/Helpers/AttachableBehaviour.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Components/Helpers/AttachableBehaviour.cs
@@ -282,7 +282,7 @@ public override void OnNetworkPreDespawn()
             {
                 ForceDetach();
             }
-            base.OnNetworkDespawn();
+            base.OnNetworkPreDespawn();
         }
 
         /// <summary>
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/OwnershipPermissionsTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/OwnershipPermissionsTests.cs
index cc090c22e0..425a9ccc8c 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/OwnershipPermissionsTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/OwnershipPermissionsTests.cs
@@ -659,7 +659,8 @@ public override void OnNetworkDespawn()
             {
                 NetworkObject.OnOwnershipRequested = null;
                 NetworkObject.OnOwnershipRequestResponse = null;
-                base.OnNetworkSpawn();
+                NetworkObject.OnOwnershipPermissionsFailure = null;
+                base.OnNetworkDespawn();
             }
 
             protected override void OnOwnershipChanged(ulong previous, ulong current)