diff --git a/Minecraft.World/Player.cpp b/Minecraft.World/Player.cpp
index 51f74a3a..5f916a50 100644
--- a/Minecraft.World/Player.cpp
+++ b/Minecraft.World/Player.cpp
@@ -2574,11 +2574,11 @@ void Player::restoreFrom(shared_ptr<Player> oldPlayer, bool restoreAll)
 #if defined(MINECRAFT_SERVER_BUILD)
 	else if (oldPlayer->fk_hasDeathState)
 	{
-		if (oldPlayer->fk_deathKeepInventory)
+		if (oldPlayer->fk_deathKeepInventory || level->getGameRules()->getBoolean(GameRules::RULE_KEEPINVENTORY))
 		{
 			inventory->replaceWith(oldPlayer->inventory);
 		}
-		if (oldPlayer->fk_deathKeepLevel)
+		if (oldPlayer->fk_deathKeepLevel || level->getGameRules()->getBoolean(GameRules::RULE_KEEPINVENTORY))
 		{
 			experienceLevel = oldPlayer->experienceLevel;
 			totalExperience = oldPlayer->totalExperience;