diff --git a/src/main/java/net/minestom/server/item/ItemStack.java b/src/main/java/net/minestom/server/item/ItemStack.java
index b0d5d99bf..d79405498 100644
--- a/src/main/java/net/minestom/server/item/ItemStack.java
+++ b/src/main/java/net/minestom/server/item/ItemStack.java
@@ -572,7 +572,10 @@ public class ItemStack implements DataContainer {
      * @return the item meta
      */
     private ItemMeta findMeta() {
-        if (material == Material.POTION)
+        if (material == Material.POTION ||
+                material == Material.LINGERING_POTION ||
+                material == Material.SPLASH_POTION ||
+                material == Material.TIPPED_ARROW)
             return new PotionMeta();
 
         if (material == Material.FILLED_MAP)