diff --git a/birdnet-pi/rootfs/etc/cont-finish.d/savestreamdata b/birdnet-pi/rootfs/etc/cont-finish.d/savestreamdata
index cafd8b821..a765f80f6 100644
--- a/birdnet-pi/rootfs/etc/cont-finish.d/savestreamdata
+++ b/birdnet-pi/rootfs/etc/cont-finish.d/savestreamdata
@@ -1,14 +1,17 @@
 #!/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/
+if [ -d /tmp/StreamData ]; then
+    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"
 fi
-
-bashio::log.fatal "... files safe, allowing container to stop"