diff --git a/azalea-client/src/plugins/packet/game/mod.rs b/azalea-client/src/plugins/packet/game/mod.rs
index a715a77e..4968a699 100644
--- a/azalea-client/src/plugins/packet/game/mod.rs
+++ b/azalea-client/src/plugins/packet/game/mod.rs
@@ -1514,7 +1514,8 @@ impl GamePacketHandler<'_> {
             commands
                 .entity(self.player)
                 .insert(crate::client::InConfigState)
-                .remove::<crate::JoinedClientBundle>();
+                .remove::<crate::JoinedClientBundle>()
+                .remove::<EntityBundle>();
         });
     }
 
diff --git a/azalea-client/tests/despawn_entities_when_changing_dimension.rs b/azalea-client/tests/despawn_entities_when_changing_dimension.rs
index 39cea091..133506c9 100644
--- a/azalea-client/tests/despawn_entities_when_changing_dimension.rs
+++ b/azalea-client/tests/despawn_entities_when_changing_dimension.rs
@@ -1,18 +1,17 @@
-use azalea_client::{InConfigState, InGameState, test_simulation::*};
+use azalea_client::test_simulation::*;
 use azalea_core::{
     delta::PositionDelta8,
     position::{ChunkPos, Vec3},
     resource_location::ResourceLocation,
 };
-use azalea_entity::{LocalEntity, metadata::Cow};
+use azalea_entity::metadata::Cow;
 use azalea_protocol::packets::{
     ConnectionProtocol,
     config::{ClientboundFinishConfiguration, ClientboundRegistryData},
     game::ClientboundAddEntity,
 };
 use azalea_registry::DimensionType;
-use azalea_world::InstanceName;
-use bevy_ecs::{entity::Entity, query::With};
+use bevy_ecs::query::With;
 use bevy_log::tracing_subscriber;
 use simdnbt::owned::{NbtCompound, NbtTag};
 use uuid::Uuid;