diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt
index 6267aa6b8ef3..93c321198eb4 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.kt
@@ -127,7 +127,7 @@ class ConflictsResolveActivity : FileActivity(), OnConflictDecisionMadeListener
     }
 
     private fun updateThumbnailIfNeeded(decision: Decision?, file: OCFile?) {
-        if (decision == Decision.KEEP_BOTH || decision == Decision.KEEP_SERVER) {
+        if (decision == Decision.KEEP_BOTH || decision == Decision.KEEP_LOCAL) {
             file?.isUpdateThumbnailNeeded = true
             fileDataStorageManager.saveFile(file)
         }