diff --git a/gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy b/gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy
index de1e693e..4c557043 100644
--- a/gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy
+++ b/gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy
@@ -681,6 +681,8 @@ class MainFrameModel {
                     break
                 }
             }
+            if (index == -1)
+                return // TODO: investigate how this is possible
             if (uiSettings.clearUploads) {
                 uploads.remove(index)
                 view.removeUploadsTableRow(index)