diff --git a/src/main/java/net/minecraftforge/fluids/ForgeFlowingFluid.java b/src/main/java/net/minecraftforge/fluids/ForgeFlowingFluid.java
index 7e6893b222..ca63b41fb1 100644
--- a/src/main/java/net/minecraftforge/fluids/ForgeFlowingFluid.java
+++ b/src/main/java/net/minecraftforge/fluids/ForgeFlowingFluid.java
@@ -19,6 +19,9 @@
 
 package net.minecraftforge.fluids;
 
+import java.util.Optional;
+import javax.annotation.Nonnull;
+import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.Blocks;
@@ -143,6 +146,13 @@ public abstract class ForgeFlowingFluid extends FlowingFluid
         return fluidIn == still.get() || fluidIn == flowing.get();
     }
 
+    @Nonnull
+    @Override
+    public Optional<SoundEvent> getPickupSound()
+    {
+        return Optional.ofNullable(getAttributes().getFillSound());
+    }
+
     @Override
     protected FluidAttributes createAttributes()
     {