diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs
index 5c6fb265..d5519a99 100644
--- a/SparkleShare/SparkleController.cs
+++ b/SparkleShare/SparkleController.cs
@@ -944,8 +944,12 @@ namespace SparkleShare {
                         SparkleHelpers.DebugInfo ("Controller", "Fetched gravatar for " + email);
                     }
 
-                  } catch (WebException) {
+                  } catch (WebException e) {
                         SparkleHelpers.DebugInfo ("Controller", "Failed fetching gravatar for " + email);
+
+                        // Stop downloading further avatars if we have no internet access
+                        if (e.Status == WebExceptionStatus.Timeout)
+                            break;
                   }
                }
             }