diff --git a/mods/mobs/npc.lua b/mods/mobs/npc.lua
index e6e21db0..261c8e04 100755
--- a/mods/mobs/npc.lua
+++ b/mods/mobs/npc.lua
@@ -102,6 +102,18 @@ mobs:register_mob("mobs:npc", {
 			if not minetest.setting_getbool("creative_mode") then
 				item:take_item()
 			end
+			if self.diamond_count < 4 then return end
+			-- if owner switch between follow and stand
+			if self.owner and self.owner == clicker:get_player_name() then
+				self.damages = 4
+				if self.order == "follow" then
+					self.order = "stand"
+				else
+					self.order = "follow"
+				end
+			else
+				self.owner = clicker:get_player_name()
+			end
 		-- pick up npc
 		elseif item:get_name() == "mobs:magic_lasso"
 		and clicker:is_player()
@@ -122,20 +134,6 @@ mobs:register_mob("mobs:npc", {
 			elseif self.owner ~= name then
 				minetest.chat_send_player(name, "Not owner!")
 			end
-			if self.diamond_count < 4 then return end
-
-		else
-			-- if owner switch between follow and stand
-			if self.owner and self.owner == clicker:get_player_name() then
-				self.damages = 4
-				if self.order == "follow" then
-					self.order = "stand"
-				else
-					self.order = "follow"
-				end
-			else
-				self.owner = clicker:get_player_name()
-			end
 		end
 	end,
 })