diff --git a/src/main/java/eu/siacs/conversations/utils/Resolver.java b/src/main/java/eu/siacs/conversations/utils/Resolver.java
index 6717b8a3f..a81045434 100644
--- a/src/main/java/eu/siacs/conversations/utils/Resolver.java
+++ b/src/main/java/eu/siacs/conversations/utils/Resolver.java
@@ -120,7 +120,12 @@ public class Resolver {
                 }
             }
         } catch (InterruptedException e) {
-            return results;
+            for(Thread thread : threads) {
+                thread.interrupt();
+            }
+            synchronized (results) {
+                return new ArrayList<>(results);
+            }
         }
     }