diff --git a/app/controllers/asset_sync_controller.rb b/app/controllers/asset_sync_controller.rb
index 5d74edbd5..a2f55f62b 100644
--- a/app/controllers/asset_sync_controller.rb
+++ b/app/controllers/asset_sync_controller.rb
@@ -37,8 +37,8 @@ class AssetSyncController < ApplicationController
     end
 
     ActiveRecord::Base.transaction do
-      @asset.file.attach(io: request.body, filename: @asset.file.filename)
       @asset.update(last_modified_by: current_user)
+      @asset.file.attach(io: request.body, filename: @asset.file.filename)
 
       log_activity(:edit)
     end
diff --git a/app/controllers/assets_controller.rb b/app/controllers/assets_controller.rb
index 504f376ab..e7e60c82c 100644
--- a/app/controllers/assets_controller.rb
+++ b/app/controllers/assets_controller.rb
@@ -186,8 +186,8 @@ class AssetsController < ApplicationController
     orig_file_name = @asset.file_name
     return render_403 unless can_read_team?(@asset.team)
 
-    @asset.file.attach(io: params.require(:image), filename: orig_file_name)
     @asset.last_modified_by = current_user
+    @asset.file.attach(io: params.require(:image), filename: orig_file_name)
     @asset.save!
     create_edit_image_activity(@asset, current_user, :finish_editing)
     # release previous image space
diff --git a/app/services/marvin_js_service.rb b/app/services/marvin_js_service.rb
index 25e2ceac6..0e9edda27 100644
--- a/app/services/marvin_js_service.rb
+++ b/app/services/marvin_js_service.rb
@@ -39,8 +39,8 @@ class MarvinJsService
       return unless attachment
 
       file = generate_image(params)
-      attach_file(attachment, file, params)
       asset.update(last_modified_by: current_user) if asset.is_a?(Asset)
+      attach_file(attachment, file, params)
       asset.post_process_file if asset.instance_of?(Asset)
       asset
     end