diff --git a/src/main/java/com/eu/habbo/habbohotel/commands/TakeBadgeCommand.java b/src/main/java/com/eu/habbo/habbohotel/commands/TakeBadgeCommand.java
index a1097852..2afe3bb3 100644
--- a/src/main/java/com/eu/habbo/habbohotel/commands/TakeBadgeCommand.java
+++ b/src/main/java/com/eu/habbo/habbohotel/commands/TakeBadgeCommand.java
@@ -46,9 +46,21 @@ public class TakeBadgeCommand extends Command {
                 }
             }
 
-            gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_take_badge"), RoomChatMessageBubbles.ALERT);
+            int userId = 0;
 
-            BadgesComponent.deleteBadge(habbo != null ? habbo.getHabboInfo().getId() : HabboManager.getOfflineHabboInfo(username).getId(), badge);
+            if (habbo != null)
+                userId = habbo.getHabboInfo().getId();
+            else {
+                HabboInfo habboInfo = HabboManager.getOfflineHabboInfo(username);
+                if (habboInfo != null)
+                    userId = habboInfo.getId();
+            }
+
+            if (userId > 0) {
+                gameClient.getHabbo().whisper(Emulator.getTexts().getValue("commands.succes.cmd_take_badge"), RoomChatMessageBubbles.ALERT);
+
+                BadgesComponent.deleteBadge(userId, badge);
+            }
         }
 
         return true;