diff --git a/client/src/main/java/ctbrec/ui/RecordingsTab.java b/client/src/main/java/ctbrec/ui/RecordingsTab.java
index 0f0ed90f..d2821dd3 100644
--- a/client/src/main/java/ctbrec/ui/RecordingsTab.java
+++ b/client/src/main/java/ctbrec/ui/RecordingsTab.java
@@ -191,7 +191,6 @@ public class RecordingsTab extends Tab implements TabSelectionListener {
             }
         };
         return cell;
-
     }
 
     private TableCell<JavaFxRecording, Instant> createDateCell() {
@@ -242,7 +241,7 @@ public class RecordingsTab extends Tab implements TabSelectionListener {
         if (recordings != null && !recordings.isEmpty()) {
             State status = recordings.get(0).getStatus();
             if (event.getCode() == KeyCode.DELETE) {
-                if(recordings.size() > 1 || status == FINISHED || status == FAILED) {
+                if(recordings.size() > 1 || status == FINISHED || status == FAILED || status == WAITING) {
                     delete(recordings);
                 }
             } else if (event.getCode() == KeyCode.ENTER && status == FINISHED) {
@@ -578,7 +577,7 @@ public class RecordingsTab extends Tab implements TabSelectionListener {
                 List<Recording> deleted = new ArrayList<>();
                 for (Iterator<JavaFxRecording> iterator = recordings.iterator(); iterator.hasNext();) {
                     JavaFxRecording r =  iterator.next();
-                    if(r.getStatus() != FINISHED && r.getStatus() != FAILED) {
+                    if(r.getStatus() != FINISHED && r.getStatus() != FAILED && r.getStatus() != State.WAITING) {
                         continue;
                     }
                     try {