diff --git a/CHANGELOG.md b/CHANGELOG.md
index e98fad2..be75398 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2.0.1
+- Fixed tridents getting lost on return when throwing many of them from the offhand while having "return-to-offhand" set to "true"
+
 ## 2.0.0
 - Renamed plugin to "BetterTridents"
 - Added new mechanics and config options:
diff --git a/pom.xml b/pom.xml
index 40626da..9c8c9e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>de.jeff_media</groupId>
     <name>BetterTridents</name>
     <artifactId>BetterTridents</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
 
     <properties>
         <spigot.prefix>${project.name}</spigot.prefix>
diff --git a/src/main/java/de/jeff_media/bettertridents/tasks/MoveToOffhand.java b/src/main/java/de/jeff_media/bettertridents/tasks/MoveToOffhand.java
index 106d1d9..1352b8d 100644
--- a/src/main/java/de/jeff_media/bettertridents/tasks/MoveToOffhand.java
+++ b/src/main/java/de/jeff_media/bettertridents/tasks/MoveToOffhand.java
@@ -1,5 +1,6 @@
 package de.jeff_media.bettertridents.tasks;
 
+import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.scheduler.BukkitRunnable;
@@ -17,8 +18,11 @@ public class MoveToOffhand extends BukkitRunnable {
     public void run() {
         for (ItemStack item : player.getInventory()) {
             if (item != null && item.equals(tridentItem)) {
-                player.getInventory().remove(item);
-                player.getInventory().setItemInOffHand(item.clone());
+                ItemStack offhand = player.getInventory().getItemInOffHand();
+                if(offhand == null || offhand.getType() == Material.AIR) {
+                    player.getInventory().remove(item);
+                    player.getInventory().setItemInOffHand(item.clone());
+                }
                 break;
             }
         }