diff --git a/src/AudioEngine.js b/src/AudioEngine.js
index c4e5805..0747b2e 100644
--- a/src/AudioEngine.js
+++ b/src/AudioEngine.js
@@ -156,7 +156,7 @@ class AudioEngine {
             .catch(() => {
                 // If the file is empty, create an empty sound
                 if (sound.data.length === 0) {
-                    return Promise.resolve(this.audioContext.createBuffer(1, 1, this.audioContext.sampleRate));
+                    return Promise.resolve(this._emptySound());
                 }
 
                 // The audio context failed to parse the sound data
@@ -165,7 +165,8 @@ class AudioEngine {
                 // First we need to create another copy of our original data
                 const bufferCopy2 = sound.data.buffer.slice(0);
                 // Try decoding as adpcm
-                return new ADPCMSoundDecoder(this.audioContext).decode(bufferCopy2);
+                return new ADPCMSoundDecoder(this.audioContext).decode(bufferCopy2)
+                    .catch(() => Promise.resolve(this._emptySound()));
             })
             .then(
                 buffer => ([soundId, buffer]),
@@ -177,6 +178,14 @@ class AudioEngine {
         return decoding;
     }
 
+    /**
+     * An empty sound buffer, for use when we are unable to decode a sound file.
+     * @returns {AudioBuffer} - an empty audio buffer.
+     */
+    _emptySound () {
+        return this.audioContext.createBuffer(1, 1, this.audioContext.sampleRate);
+    }
+
     /**
      * Decode a sound, decompressing it into audio samples.
      *