diff --git a/crates/valence_server/src/client.rs b/crates/valence_server/src/client.rs
index 776ecbc40..189fdff6a 100644
--- a/crates/valence_server/src/client.rs
+++ b/crates/valence_server/src/client.rs
@@ -385,7 +385,9 @@ impl Command for DisconnectClient {
                     reason: self.reason.into(),
                 });
 
-                entity.remove::<Client>();
+                // Despawned will be removed at the end of the tick, this way, the packets have
+                // time to be sent.
+                entity.insert(Despawned);
             }
         }
     }