diff --git a/data/creaturescripts/scripts/killing_in_the_name_of.lua b/data/creaturescripts/scripts/killing_in_the_name_of.lua
index f3c4476..a5a7c60 100644
--- a/data/creaturescripts/scripts/killing_in_the_name_of.lua
+++ b/data/creaturescripts/scripts/killing_in_the_name_of.lua
@@ -95,7 +95,7 @@ function onKill(player, target)
 	
 		local players
 		local party = player:getParty()
-		if party ~= nil then
+		if party ~= nil and party:isSharedExperienceEnabled() then
 			players = party:getMembers() -- all members of the party
 			players[#players + 1] = party:getLeader() -- don't forget the leader
 		else
diff --git a/src/party.cpp b/src/party.cpp
index a7a9d8c..d9b06ba 100644
--- a/src/party.cpp
+++ b/src/party.cpp
@@ -428,18 +428,6 @@ bool Party::canUseSharedExperience(const Player* player) const
 		return false;
 	}
 
-	if (!player->hasFlag(PlayerFlag_NotGainInFight)) {
-		//check if the player has healed/attacked anything recently
-		auto it = ticksMap.find(player->getID());
-		if (it == ticksMap.end()) {
-			return false;
-		}
-
-		uint64_t timeDiff = OTSYS_TIME() - it->second;
-		if (timeDiff > static_cast<uint64_t>(g_config.getNumber(ConfigManager::PZ_LOCKED))) {
-			return false;
-		}
-	}
 	return true;
 }