diff --git a/companion/src/modeledit/inputs.cpp b/companion/src/modeledit/inputs.cpp
index f8df7d8fb..0c0718974 100644
--- a/companion/src/modeledit/inputs.cpp
+++ b/companion/src/modeledit/inputs.cpp
@@ -272,6 +272,9 @@ void InputsPanel::setSelectedByExpoList(QList<int> list)
 
 void InputsPanel::exposDelete(bool ask)
 {
+    QList<int> list = createExpoListFromSelected();
+    if(list.isEmpty()) return;
+
     QMessageBox::StandardButton ret = QMessageBox::No;
 
     if(ask)
@@ -281,7 +284,7 @@ void InputsPanel::exposDelete(bool ask)
 
 
     if ((ret == QMessageBox::Yes) || (!ask)) {
-        exposDeleteList(createExpoListFromSelected());
+        exposDeleteList(list);
         emit modified();
         update();
     }
diff --git a/companion/src/modeledit/mixes.cpp b/companion/src/modeledit/mixes.cpp
index f6b4ab97f..a6b6459d9 100644
--- a/companion/src/modeledit/mixes.cpp
+++ b/companion/src/modeledit/mixes.cpp
@@ -322,6 +322,9 @@ void MixesPanel::setSelectedByMixList(QList<int> list)
 
 void MixesPanel::mixersDelete(bool ask)
 {
+    QList<int> list = createMixListFromSelected();
+    if(list.isEmpty()) return;
+
     QMessageBox::StandardButton ret = QMessageBox::No;
 
     if(ask)
@@ -331,7 +334,7 @@ void MixesPanel::mixersDelete(bool ask)
 
 
     if ((ret == QMessageBox::Yes) || (!ask)) {
-      mixersDeleteList(createMixListFromSelected());
+      mixersDeleteList(list);
       emit modified();
       update();
     }