diff --git a/src/de/steamwar/bungeecore/commands/WhoisCommand.java b/src/de/steamwar/bungeecore/commands/WhoisCommand.java
index 0f827cb6..1303059c 100644
--- a/src/de/steamwar/bungeecore/commands/WhoisCommand.java
+++ b/src/de/steamwar/bungeecore/commands/WhoisCommand.java
@@ -103,7 +103,7 @@ public class WhoisCommand extends BasicCommand {
             if (!all && !punishment.getType().isMulti() && !found.add(punishment.getType())) {
                 continue;
             }
-            if (!punishment.isCurrent()) {
+            if (!all && !punishment.isCurrent()) {
                 continue;
             }
             Message.sendPrefixless("WHOIS_PUNISHMENT", player, SteamwarUser.get(punishment.getPunisher()).getUserName(), punishment.getType().name(), punishment.getBantime(punishment.getStartTime(), false), punishment.getBantime(punishment.getEndTime(), punishment.isPerma()), punishment.getReason());