diff --git a/file_entity.file.inc b/file_entity.file.inc
index 3b76626..00b9bf2 100644
--- a/file_entity.file.inc
+++ b/file_entity.file.inc
@@ -65,7 +65,9 @@ function file_entity_file_update($file) {
     }
 
     // Flush image style derivatives whenever an image is updated.
-    image_path_flush($file->uri);
+    if (!variable_get('file_entity_update_disable_flush', FALSE)) {
+      image_path_flush($file->uri);
+    }
   }
 }