diff --git a/companion/src/modelslist.cpp b/companion/src/modelslist.cpp
index 38f6e847e..95ecea118 100644
--- a/companion/src/modelslist.cpp
+++ b/companion/src/modelslist.cpp
@@ -207,11 +207,13 @@ QModelIndex TreeModel::parent(const QModelIndex & index) const
 bool TreeModel::removeRows(int position, int rows, const QModelIndex & parent)
 {
   TreeItem * parentItem = getItem(parent);
-  bool success;
+  bool success = true;
   
-  beginRemoveRows(parent, position, position + rows - 1);
-  success = parentItem->removeChildren(position, rows);
-  endRemoveRows();
+  if (position >= 0 && rows > 0) {
+    beginRemoveRows(parent, position, position + rows - 1);
+    success = parentItem->removeChildren(position, rows);
+    endRemoveRows();
+  }
   
   return success;
 }