diff --git a/build/egress/entrypoint.sh b/build/egress/entrypoint.sh
index 382372a5..4ea554ee 100755
--- a/build/egress/entrypoint.sh
+++ b/build/egress/entrypoint.sh
@@ -15,7 +15,11 @@
 
 set -euo pipefail
 
-# Clean out tmp
+# Preserve any recordings from the previous session before cleanup
+if [ -d /home/egress/tmp ] && [ "$(ls -A /home/egress/tmp 2>/dev/null)" ]; then
+    mkdir -p /home/egress/recovered
+    cp -r /home/egress/tmp/. /home/egress/recovered/
+fi
 rm -rf /home/egress/tmp/*
 
 # Adjust max open file
diff --git a/pkg/server/server.go b/pkg/server/server.go
index a6cb24b9..8264a51d 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -163,13 +163,14 @@ func (s *Server) Run() error {
 func (s *Server) Status() ([]byte, error) {
 	status := map[string]interface{}{
 		"CpuLoad": s.monitor.GetAvailableCPU(),
+		"NodeId":  s.conf.NodeID,
 	}
 	s.GetStatus(status)
 	return json.Marshal(status)
 }
 
 func (s *Server) IsIdle() bool {
-	return s.activeRequests.Load() == 0
+	return s.activeRequests.Load() == 0 && !s.IsDisabled()
 }
 
 func (s *Server) IsDisabled() bool {