diff --git a/packages/soundfonts/fontloader.mjs b/packages/soundfonts/fontloader.mjs
index ca9e45d51..95e210890 100644
--- a/packages/soundfonts/fontloader.mjs
+++ b/packages/soundfonts/fontloader.mjs
@@ -7,6 +7,7 @@ import {
   getPitchEnvelope,
   getVibratoOscillator,
   onceEnded,
+  releaseAudioNode,
 } from '@strudel/webaudio';
 import gm from './gm.mjs';
 
@@ -172,9 +173,8 @@ export function registerSoundfonts() {
         bufferSource.stop(envEnd);
         const stop = (releaseTime) => {};
         onceEnded(bufferSource, () => {
-          bufferSource.disconnect();
-          vibratoOscillator?.stop();
-          node.disconnect();
+          releaseAudioNode(bufferSource);
+          releaseAudioNode(vibratoOscillator);
           onended();
         });
         return { node, stop };
diff --git a/packages/superdough/helpers.mjs b/packages/superdough/helpers.mjs
index f000db63e..5202dbdfe 100644
--- a/packages/superdough/helpers.mjs
+++ b/packages/superdough/helpers.mjs
@@ -189,7 +189,7 @@ export function applyParameterModulators(audioContext, param, start, end, envelo
     getParamADSR(param, attack, decay, sustain, release, min, max, start, holdEnd, curve);
   }
   const lfo = getParamLfo(audioContext, param, start, end, lfoValues);
-  return { lfo, disconnect: () => lfo?.disconnect() };
+  return lfo
 }
 export function createFilter(context, start, end, params, cps, cycle) {
   let {
@@ -325,8 +325,8 @@ export function getVibratoOscillator(param, value, t) {
     vibratoOscillator.connect(gain);
     gain.connect(param);
     onceEnded(vibratoOscillator, () => {
-      gain.disconnect(param);
-      vibratoOscillator.disconnect(gain);
+      releaseAudioNode(gain);
+      releaseAudioNode(vibratoOscillator);
     });
     vibratoOscillator.start(t);
     return vibratoOscillator;
diff --git a/packages/superdough/sampler.mjs b/packages/superdough/sampler.mjs
index 1e8c786bf..0e1e291ff 100644
--- a/packages/superdough/sampler.mjs
+++ b/packages/superdough/sampler.mjs
@@ -329,10 +329,10 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) {
   const out = ac.createGain(); // we need a separate gain for the cutgroups because firefox...
   node.connect(out);
   onceEnded(bufferSource, function () {
-    bufferSource.disconnect();
-    vibratoOscillator?.stop();
-    node.disconnect();
-    out.disconnect();
+    releaseAudioNode(bufferSource);
+    releaseAudioNode(vibratoOscillator);
+    releaseAudioNode(node);
+    releaseAudioNode(out);
     onended();
   });
   let envEnd = holdEnd + release + 0.01;
diff --git a/packages/superdough/superdough.mjs b/packages/superdough/superdough.mjs
index 6f610d514..bfcf3ab5c 100644
--- a/packages/superdough/superdough.mjs
+++ b/packages/superdough/superdough.mjs
@@ -9,7 +9,7 @@ import './reverb.mjs';
 import './vowel.mjs';
 import { nanFallback, _mod, cycleToSeconds, pickAndRename } from './util.mjs';
 import workletsUrl from './worklets.mjs?audioworklet';
-import { createFilter, gainNode, getCompressor, getDistortion, getLfo, getWorklet, effectSend } from './helpers.mjs';
+import { createFilter, gainNode, getCompressor, getDistortion, getLfo, getWorklet, effectSend, releaseAudioNode } from './helpers.mjs';
 import { map } from 'nanostores';
 import { logger } from './logger.mjs';
 import { loadBuffer } from './sampler.mjs';
@@ -506,7 +506,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   } else if (getSound(s)) {
     const { onTrigger } = getSound(s);
     const onEnded = () => {
-      audioNodes.forEach((n) => n?.disconnect());
+      audioNodes.forEach((n) => releaseAudioNode(n));
       activeSoundSources.delete(chainID);
     };
     const soundHandle = await onTrigger(t, value, onEnded, cps);
diff --git a/packages/superdough/synth.mjs b/packages/superdough/synth.mjs
index a2d3aeca0..e82c889ac 100644
--- a/packages/superdough/synth.mjs
+++ b/packages/superdough/synth.mjs
@@ -1,6 +1,5 @@
 import { clamp } from './util.mjs';
 import { registerSound, soundMap } from './superdough.mjs';
-import { onceEnded } from './helpers.mjs';
 import { getAudioContext } from './audioContext.mjs';
 import {
   applyFM,
@@ -13,6 +12,7 @@ import {
   getVibratoOscillator,
   getWorklet,
   noises,
+  onceEnded,
   releaseAudioNode,
   webAudioTimeout,
 } from './helpers.mjs';
@@ -53,7 +53,7 @@ export function registerSynthSounds() {
         const g = gainNode(0.3);
 
         let sound = getOscillator(s, t, value, () => {
-          g.disconnect();
+          releaseAudioNode(g);
           onended();
         });
 
@@ -112,12 +112,12 @@ export function registerSynthSounds() {
       const mix = gainNode(mixGain);
 
       onceEnded(o, () => {
-        o.disconnect();
-        g.disconnect();
-        sat.disconnect();
-        noise.node.disconnect();
-        noiseGain.disconnect();
-        mix.disconnect();
+        releaseAudioNode(o);
+        releaseAudioNode(g);
+        releaseAudioNode(sat);
+        releaseAudioNode(noise.node);
+        releaseAudioNode(noiseGain);
+        releaseAudioNode(mix);
         onended();
       });
 
@@ -386,8 +386,8 @@ export function registerSynthSounds() {
         const { duration } = value;
 
         onceEnded(o, () => {
-          o.disconnect();
-          g.disconnect();
+          releaseAudioNode(o);
+          releaseAudioNode(g);
           onended();
         });
 
@@ -491,8 +491,8 @@ export function getOscillator(s, t, value, onended) {
   }
 
   onceEnded(o, () => {
-    noiseMix || o.disconnect();
-    noiseMix?.node.disconnect();
+    noiseMix || releaseAudioNode(o);
+    releaseAudioNode(noiseMix?.node);
     onended();
   });
   o.start(t);
diff --git a/packages/superdough/wavetable.mjs b/packages/superdough/wavetable.mjs
index e9d810414..4311c5cab 100644
--- a/packages/superdough/wavetable.mjs
+++ b/packages/superdough/wavetable.mjs
@@ -320,10 +320,10 @@ export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
     ac,
     () => {
       releaseAudioNode(source);
-      vibratoOscillator?.stop();
+      releaseAudioNode(vibratoOscillator);
       fm?.stop();
-      wtPosModulators?.disconnect();
-      wtWarpModulators?.disconnect();
+      releaseAudioNode(wtPosModulators);
+      releaseAudioNode(wtWarpModulators);
       onended();
     },
     t,