diff --git a/plugins/LFOModulationPlugin.py b/plugins/LFOModulationPlugin.py
index 4210583..b4f267b 100644
--- a/plugins/LFOModulationPlugin.py
+++ b/plugins/LFOModulationPlugin.py
@@ -128,6 +128,7 @@ class LFOModulationPlugin(ActionsPlugin,SequencePlugin,DisplayPlugin, Automation
 
     def toggle_lfo_active(self):
         self.active = not self.active
+        self.save_presets()
 
     # Formula handling for generating automation
     # mapping 0-3 to match the LFO 
diff --git a/plugins/MidiFeedbackAPCKey25Plugin.py b/plugins/MidiFeedbackAPCKey25Plugin.py
index 4095070..58bcfb0 100644
--- a/plugins/MidiFeedbackAPCKey25Plugin.py
+++ b/plugins/MidiFeedbackAPCKey25Plugin.py
@@ -19,6 +19,12 @@ class MidiFeedbackAPCKey25Plugin(MidiFeedbackPlugin):
             print ("bind is %s, returning default" % bind)
             return default
 
+    def stop_plugin(self):
+        for cmd, content in self.status.items():
+            content['velocity'] = 0
+        self.update_device()
+        super().stop_plugin()
+
     def set_midi_device(self, device):
         super().set_midi_device(device)
         self.last_state = None