diff --git a/core/src/dsp/audio/volume.h b/core/src/dsp/audio/volume.h
index b07886a..708fb9e 100644
--- a/core/src/dsp/audio/volume.h
+++ b/core/src/dsp/audio/volume.h
@@ -12,6 +12,7 @@ namespace dsp::audio {
 
         void init(stream<stereo_t>* in, double volume, bool muted) {
             _volume = powf(volume, 2);
+            _muted = muted;
             level = { -150.0f, -150.0f };
             base_type::init(in);
         }
diff --git a/core/src/dsp/routing/splitter.h b/core/src/dsp/routing/splitter.h
index 50379c9..bb50db7 100644
--- a/core/src/dsp/routing/splitter.h
+++ b/core/src/dsp/routing/splitter.h
@@ -21,8 +21,8 @@ namespace dsp::routing {
 
             // Add to the list
             base_type::tempStop();
-            streams.push_back(stream);
             base_type::registerOutput(stream);
+            streams.push_back(stream);
             base_type::tempStart();
         }
 
@@ -38,8 +38,8 @@ namespace dsp::routing {
 
             // Add to the list
             base_type::tempStop();
-            base_type::unregisterOutput(stream);
             streams.erase(sit);
+            base_type::unregisterOutput(stream);
             base_type::tempStart();
         }