diff --git a/app/models/asset_sync_token.rb b/app/models/asset_sync_token.rb
index 8c1224366..0729fb7c9 100644
--- a/app/models/asset_sync_token.rb
+++ b/app/models/asset_sync_token.rb
@@ -18,7 +18,7 @@ class AssetSyncToken < ApplicationRecord
   end
 
   def conflicts?(token)
-    version_token != token
+    asset.locked? || version_token != token
   end
 
   private