diff --git a/common/src/main/java/ctbrec/recorder/NextGenLocalRecorder.java b/common/src/main/java/ctbrec/recorder/NextGenLocalRecorder.java
index 82108fff..38f99178 100644
--- a/common/src/main/java/ctbrec/recorder/NextGenLocalRecorder.java
+++ b/common/src/main/java/ctbrec/recorder/NextGenLocalRecorder.java
@@ -265,7 +265,10 @@ public class NextGenLocalRecorder implements Recorder {
                 }
                 boolean deleted = deleteIfEmpty(rec);
                 setRecordingStatus(rec, deleted ? State.DELETED : State.WAITING);
-                recordingManager.saveRecording(rec);
+                if (!deleted) {
+                    // only save the status, if the recording has not been deleted, otherwise we recreate the metadata file
+                    recordingManager.saveRecording(rec);
+                }
                 return rec;
             });
         } finally {
@@ -276,7 +279,7 @@ public class NextGenLocalRecorder implements Recorder {
     private boolean deleteIfEmpty(Recording rec) throws IOException, InvalidKeyException, NoSuchAlgorithmException {
         rec.refresh();
         long sizeInByte = rec.getSizeInByte();
-        if (sizeInByte == 0) {
+        if (sizeInByte <= 0) {
             LOG.info("Deleting empty recording {}", rec);
             delete(rec);
             return true;