diff --git a/python_payload/apps/wurzelitzer/__init__.py b/python_payload/apps/wurzelitzer/__init__.py
index c71edda4e274643e64f6e9e414103b4e3927d6e3..47eef8e4ea60e936adedd09ba2d835521643ec20 100644
--- a/python_payload/apps/wurzelitzer/__init__.py
+++ b/python_payload/apps/wurzelitzer/__init__.py
@@ -60,10 +60,12 @@ class App(Application):
 
     def on_enter(self, vm):
         super().on_enter(vm)
-        self.load_stream()
+        if not media.is_playing():
+            self.load_stream()
 
     def on_exit(self):
-        media.stop()
+        if self._streams[self._stream_no].endswith(".mpg") or not media.is_playing():
+            media.stop()
 
 
 if __name__ == "__main__":
diff --git a/python_payload/st3m/run.py b/python_payload/st3m/run.py
index cad161730a285e4a95e88e09d15aa7a2bc7a3dae..b38cd7f58bb931d2860608eb63f6650ce38fef7b 100644
--- a/python_payload/st3m/run.py
+++ b/python_payload/st3m/run.py
@@ -77,7 +77,7 @@ class ApplicationMenu(SimpleMenu):
         sys_display.set_mode(0)
         leds.set_slew_rate(100)
         led_patterns.set_menu_colors()
-        media.stop()
+        # media.stop()
 
     def on_enter(self, vm: Optional[ViewManager]) -> None:
         super().on_enter(vm)