diff --git a/src/containers/sound-editor.jsx b/src/containers/sound-editor.jsx
index 67c4b1b5fdab808d0920decf7a2becd240a8d43f..4a1b98b565bd587bcae5e6e2414f4ee3e763c5cd 100644
--- a/src/containers/sound-editor.jsx
+++ b/src/containers/sound-editor.jsx
@@ -112,9 +112,9 @@ class SoundEditor extends React.Component {
     }
     handleEffect (name) {
         const effects = new AudioEffects(this.audioBufferPlayer.buffer, name);
-        effects.process().then(newBuffer => {
-            const samples = newBuffer.getChannelData(0);
-            const sampleRate = newBuffer.sampleRate;
+        effects.process(({renderedBuffer}) => {
+            const samples = renderedBuffer.getChannelData(0);
+            const sampleRate = renderedBuffer.sampleRate;
             this.submitNewSamples(samples, sampleRate);
             this.handlePlay();
         });
diff --git a/src/lib/audio/audio-effects.js b/src/lib/audio/audio-effects.js
index 187c6ce6b9be659d404fc72e13bab33bcc413fd3..ead04bf504550f85c9837f3acb1c38adf18835d6 100644
--- a/src/lib/audio/audio-effects.js
+++ b/src/lib/audio/audio-effects.js
@@ -38,7 +38,7 @@ class AudioEffects {
             buffer.getChannelData(0).reverse();
             break;
         }
-
+        const OfflineAudioContext = window.OfflineAudioContext || window.webkitOfflineAudioContext;
         this.audioContext = new OfflineAudioContext(1, sampleCount, buffer.sampleRate);
         this.buffer = buffer;
         this.source = this.audioContext.createBufferSource();
@@ -46,7 +46,7 @@ class AudioEffects {
         this.source.playbackRate.value = playbackRate;
         this.name = name;
     }
-    process () {
+    process (done) {
         // Some effects need to use more nodes and must expose an input and output
         let input;
         let output;
@@ -75,7 +75,8 @@ class AudioEffects {
 
         this.source.start();
 
-        return this.audioContext.startRendering();
+        this.audioContext.startRendering();
+        this.audioContext.oncomplete = done;
     }
 }