diff --git a/src/main/java/dan200/computercraft/client/SoundManager.java b/src/main/java/dan200/computercraft/client/SoundManager.java
index 4e6fd4339..e4ea59c90 100644
--- a/src/main/java/dan200/computercraft/client/SoundManager.java
+++ b/src/main/java/dan200/computercraft/client/SoundManager.java
@@ -10,8 +10,8 @@
 import net.minecraft.client.audio.ITickableSound;
 import net.minecraft.client.audio.LocatableSound;
 import net.minecraft.client.audio.SoundHandler;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundCategory;
-import net.minecraft.util.SoundEvent;
 import net.minecraft.util.math.vector.Vector3d;
 
 import java.util.HashMap;
@@ -22,7 +22,7 @@ public class SoundManager
 {
     private static final Map<UUID, MoveableSound> sounds = new HashMap<>();
 
-    public static void playSound( UUID source, Vector3d position, SoundEvent event, float volume, float pitch )
+    public static void playSound( UUID source, Vector3d position, ResourceLocation event, float volume, float pitch )
     {
         SoundHandler soundManager = Minecraft.getInstance().getSoundManager();
 
@@ -55,7 +55,7 @@ public static void reset()
 
     private static class MoveableSound extends LocatableSound implements ITickableSound
     {
-        protected MoveableSound( SoundEvent sound, Vector3d position, float volume, float pitch )
+        protected MoveableSound( ResourceLocation sound, Vector3d position, float volume, float pitch )
         {
             super( sound, SoundCategory.RECORDS );
             setPosition( position );
diff --git a/src/main/java/dan200/computercraft/shared/network/client/SpeakerPlayClientMessage.java b/src/main/java/dan200/computercraft/shared/network/client/SpeakerPlayClientMessage.java
index b44e0105e..4d7bbff34 100644
--- a/src/main/java/dan200/computercraft/shared/network/client/SpeakerPlayClientMessage.java
+++ b/src/main/java/dan200/computercraft/shared/network/client/SpeakerPlayClientMessage.java
@@ -9,12 +9,10 @@
 import dan200.computercraft.shared.network.NetworkMessage;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.SoundEvent;
 import net.minecraft.util.math.vector.Vector3d;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.fml.network.NetworkEvent;
-import net.minecraftforge.registries.ForgeRegistries;
 
 import javax.annotation.Nonnull;
 import java.util.UUID;
@@ -68,7 +66,6 @@ public void toBytes( @Nonnull PacketBuffer buf )
     @OnlyIn( Dist.CLIENT )
     public void handle( NetworkEvent.Context context )
     {
-        SoundEvent sound = ForgeRegistries.SOUND_EVENTS.getValue( this.sound );
-        if( sound != null ) SoundManager.playSound( source, pos, sound, volume, pitch );
+        SoundManager.playSound( source, pos, sound, volume, pitch );
     }
 }