diff --git a/birdnet-pi/rootfs/etc/cont-finish.d/savestreamdata b/birdnet-pi/rootfs/etc/cont-finish.d/savestreamdata
new file mode 100644
index 000000000..cafd8b821
--- /dev/null
+++ b/birdnet-pi/rootfs/etc/cont-finish.d/savestreamdata
@@ -0,0 +1,14 @@
+#!/usr/bin/bashio
+bashio::log.fatal "Container stopping, saving temporary files"
+
+# Stop the services in parallel
+systemctl stop bridnet_analysis & 
+systemctl stop bridnet_recording
+wait 1
+
+# Check if there are files in /tmp/StreamData and move them to /data/StreamData
+if [ "$(ls -A /tmp/StreamData)" ]; then
+    cp -rnf /tmp/StreamData/* /data/StreamData/
+fi
+
+bashio::log.fatal "... files safe, allowing container to stop"