diff --git a/src/io/github/dre2n/dungeonsxl/dungeon/game/GameChest.java b/src/io/github/dre2n/dungeonsxl/dungeon/game/GameChest.java
index 2736032f..b43e70e0 100644
--- a/src/io/github/dre2n/dungeonsxl/dungeon/game/GameChest.java
+++ b/src/io/github/dre2n/dungeonsxl/dungeon/game/GameChest.java
@@ -49,27 +49,27 @@ public class GameChest {
 			return;
 		}
 		
+		boolean hasMoneyReward = false;
+		
+		for (Reward reward : dGroup.getRewards()) {
+			if (reward instanceof MoneyReward) {
+				hasMoneyReward = true;
+				((MoneyReward) reward).addMoney(moneyReward);
+			}
+		}
+		
+		if ( !hasMoneyReward) {
+			Reward reward = Reward.create(RewardTypeDefault.MONEY);
+			((MoneyReward) reward).addMoney(moneyReward);
+			dGroup.addReward(reward);
+		}
+		
 		for (Player player : dGroup.getPlayers()) {
 			DPlayer dPlayer = DPlayer.getByPlayer(player);
 			if (dPlayer == null) {
 				continue;
 			}
 			
-			boolean hasMoneyReward = false;
-			
-			for (Reward reward : dGroup.getRewards()) {
-				if (reward instanceof MoneyReward) {
-					hasMoneyReward = true;
-					((MoneyReward) reward).addMoney(moneyReward);
-				}
-			}
-			
-			if ( !hasMoneyReward) {
-				Reward reward = Reward.create(RewardTypeDefault.MONEY);
-				((MoneyReward) reward).addMoney(moneyReward);
-				dGroup.addReward(reward);
-			}
-			
 			String msg = "";
 			for (ItemStack itemStack : chest.getInventory().getContents()) {
 				
diff --git a/src/io/github/dre2n/dungeonsxl/player/DPlayer.java b/src/io/github/dre2n/dungeonsxl/player/DPlayer.java
index b3706b35..1cacf690 100644
--- a/src/io/github/dre2n/dungeonsxl/player/DPlayer.java
+++ b/src/io/github/dre2n/dungeonsxl/player/DPlayer.java
@@ -367,6 +367,10 @@ public class DPlayer {
 			return;
 		}
 		
+		if (hasToWait) {
+			return;
+		}
+		
 		DGroupFinishDungeonEvent dGroupFinishDungeonEvent = new DGroupFinishDungeonEvent(dGroup);
 		
 		if (dGroupFinishDungeonEvent.isCancelled()) {
@@ -376,10 +380,10 @@ public class DPlayer {
 		for (Player player : dGroup.getPlayers()) {
 			DPlayer dPlayer = getByPlayer(player);
 			dPlayer.leave();
-		}
-		
-		for (Reward reward : dGroup.getRewards()) {
-			reward.giveTo(player);
+			
+			for (Reward reward : dGroup.getRewards()) {
+				reward.giveTo(player);
+			}
 		}
 	}