diff --git a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperationIT.kt b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperationIT.kt
index 48ca667a48..431a176cbd 100644
--- a/library/src/androidTest/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperationIT.kt
+++ b/library/src/androidTest/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperationIT.kt
@@ -74,6 +74,7 @@ class UploadFileRemoteOperationIT : AbstractIT() {
 
         assertEquals(remotePath, remoteFile.remotePath)
         assertEquals(creationTimestamp, remoteFile.creationTimestamp)
+        assertEquals(uploadResult.resultData, remoteFile.etag)
         assertTrue(
             uploadTimestamp - TIME_OFFSET < remoteFile.uploadTimestamp ||
                 uploadTimestamp + TIME_OFFSET > remoteFile.uploadTimestamp
diff --git a/library/src/main/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperation.java b/library/src/main/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperation.java
index da1bc0b7ce..b8c52eae7e 100644
--- a/library/src/main/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperation.java
+++ b/library/src/main/java/com/owncloud/android/lib/resources/files/UploadFileRemoteOperation.java
@@ -236,7 +236,7 @@ protected RemoteOperationResult<String> uploadFile(OwnCloudClient client) throws
 
 			final Header resultEtagHeader = putMethod.getResponseHeader(RESULT_ETAG_HEADER);
 			if (resultEtagHeader != null) {
-				result.setResultData(resultEtagHeader.getValue());
+				result.setResultData(resultEtagHeader.getValue().replace("\"", ""));
 			}
 
 			client.exhaustResponse(putMethod.getResponseBodyAsStream());