diff --git a/app/src/main/java/org/communiquons/android/comunic/client/data/helpers/ImageLoadHelper.java b/app/src/main/java/org/communiquons/android/comunic/client/data/helpers/ImageLoadHelper.java
index daf96b7..8cd1235 100644
--- a/app/src/main/java/org/communiquons/android/comunic/client/data/helpers/ImageLoadHelper.java
+++ b/app/src/main/java/org/communiquons/android/comunic/client/data/helpers/ImageLoadHelper.java
@@ -101,6 +101,7 @@ public class ImageLoadHelper {
     private static void clean(){
 
         //Get the list of threads
+        int i = 0;
         for(View view : threads.keySet()){
 
             if(threads.get(view) != null)
@@ -108,6 +109,10 @@ public class ImageLoadHelper {
                 if(!threads.get(view).isAlive())
                     threads.remove(view);
 
+            //Avoid ArrayIndexOutOfBoundsException
+            i++;
+            if(threads.size() < i)
+                return;
         }
 
     }