diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiTeleporter.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiTeleporter.java
index 46f4a6c3..98a627fe 100644
--- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiTeleporter.java
+++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/games/battlebanzai/InteractionBattleBanzaiTeleporter.java
@@ -57,7 +57,7 @@ public class InteractionBattleBanzaiTeleporter extends HabboItem {
         super.onWalkOn(roomUnit, room, objects);
 
         if(objects.length < 3) {
-            HabboItem target = room.getRoomSpecialTypes().getRandomTeleporter(this.getBaseItem(), this);
+            HabboItem target = room.getRoomSpecialTypes().getRandomTeleporter(null, this);
             if (target == null) return;
 
             this.setExtradata("1");
diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomSpecialTypes.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomSpecialTypes.java
index 0b912776..8a1a1799 100644
--- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomSpecialTypes.java
+++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomSpecialTypes.java
@@ -100,7 +100,7 @@ public class RoomSpecialTypes {
     public InteractionBattleBanzaiTeleporter getRandomTeleporter(Item baseItem, InteractionBattleBanzaiTeleporter exclude) {
         List<InteractionBattleBanzaiTeleporter> teleporterList = new ArrayList<>();
         for (InteractionBattleBanzaiTeleporter teleporter : this.banzaiTeleporters.values()) {
-            if (teleporter.getBaseItem() == baseItem) {
+            if (baseItem == null || teleporter.getBaseItem() == baseItem) {
                 teleporterList.add(teleporter);
             }
         }