diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/HeavyBoomerang.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/HeavyBoomerang.java
index 7c5b0cb98..600003baf 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/HeavyBoomerang.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/HeavyBoomerang.java
@@ -100,9 +100,12 @@ public class HeavyBoomerang extends MissileWeapon {
 										@Override
 										public void call() {
 											if (returnTarget == Dungeon.hero){
-												boomerang.doPickUp(Dungeon.hero);
-												//grabbing the boomerang takes no time
-												Dungeon.hero.spend( -TIME_TO_PICK_UP );
+												if (boomerang.doPickUp(Dungeon.hero)) {
+													//grabbing the boomerang takes no time
+													Dungeon.hero.spend(-TIME_TO_PICK_UP);
+												} else {
+													Dungeon.level.drop(boomerang, returnPos).sprite.drop();
+												}
 												
 											} else if (returnTarget != null){
 												if (curUser.shoot( returnTarget, boomerang )) {