diff --git a/app/src/main/java/com/nutomic/syncthingandroid/http/ApiRequest.java b/app/src/main/java/com/nutomic/syncthingandroid/http/ApiRequest.java
index 315e47bb..56d04153 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/http/ApiRequest.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/http/ApiRequest.java
@@ -10,6 +10,7 @@ import android.util.Log;
 import android.widget.ImageView;
 
 import com.android.volley.AuthFailureError;
+import com.android.volley.DefaultRetryPolicy;
 import com.android.volley.RequestQueue;
 import com.android.volley.VolleyError;
 import com.android.volley.toolbox.HurlStack;
@@ -113,6 +114,11 @@ public abstract class ApiRequest {
                 return Optional.fromNullable(requestBody).transform(String::getBytes).orNull();
             }
         };
+
+        // Some requests seem to be slow or fail, make sure this doesn't break the app
+        // (eg if an event request fails, new event requests won't be triggered).
+        request.setRetryPolicy(new DefaultRetryPolicy(5000, 5,
+                DefaultRetryPolicy.DEFAULT_BACKOFF_MULT));
         getVolleyQueue().add(request);
     }
 
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/EventProcessor.java b/app/src/main/java/com/nutomic/syncthingandroid/service/EventProcessor.java
index 66842ddd..69195cf6 100644
--- a/app/src/main/java/com/nutomic/syncthingandroid/service/EventProcessor.java
+++ b/app/src/main/java/com/nutomic/syncthingandroid/service/EventProcessor.java
@@ -150,7 +150,6 @@ public class EventProcessor implements SyncthingService.OnWebGuiAvailableListene
                 File updatedFile = new File(folderPath, (String) event.data.get("item"));
                 if (!"delete".equals(event.data.get("action"))) {
                     Log.i(TAG, "Rescanned file via MediaScanner: " + updatedFile.toString());
-                    Log.d("xxx", "update intent sent for " + updatedFile.getName());
                     MediaScannerConnection.scanFile(mContext, new String[]{updatedFile.getPath()},
                             null, null);
                 } else {