diff --git a/src/de/steamwar/bungeecore/sql/SteamwarUser.java b/src/de/steamwar/bungeecore/sql/SteamwarUser.java
index 5e9ddcea..ea73ffd6 100644
--- a/src/de/steamwar/bungeecore/sql/SteamwarUser.java
+++ b/src/de/steamwar/bungeecore/sql/SteamwarUser.java
@@ -294,7 +294,7 @@ public class SteamwarUser {
             player.disconnect(punishmentMessage(punishment, player));
             for (BannedUserIPs banned : BannedUserIPs.get(player.getAddress().getAddress().getHostAddress())) {
                 SteamwarUser bannedUser = SteamwarUser.get(banned.getUserID());
-                if (isPunished(punishment) && banned.getTimestamp().before(time)) {
+                if (isPunished(punishment) && bannedUser.getPunishment(punishment).getEndTime().before(time)) {
                     bannedUser.punish(punishment, time, banReason, from, perma);
                 }
             }