diff --git a/filefield_paths.module b/filefield_paths.module
index 558ddb2..41ffd88 100644
--- a/filefield_paths.module
+++ b/filefield_paths.module
@@ -317,7 +317,14 @@ function filefield_paths_entity_update($entity, $type) {
     }
 
     if ($update->entity == TRUE) {
+      // Remember revision flag
+      $revision = $entity->revision;
+      // Remove revision flag as long as fields already processed it,
+      // and no need to create new revision for moved files.
+      $entity->revision = 0;
       field_attach_update($type, $entity);
+      // Restore revision flag so that other modules can process it if needed.
+      $entity->revision = $revision;
     }
 
     // Cleanup temporary paths.