diff --git a/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java b/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java
index d525f37de441..51948546e394 100644
--- a/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java
+++ b/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java
@@ -55,6 +55,7 @@
 import com.owncloud.android.lib.resources.files.ReadFileRemoteOperation;
 import com.owncloud.android.lib.resources.files.UploadFileRemoteOperation;
 import com.owncloud.android.lib.resources.files.model.RemoteFile;
+import com.owncloud.android.lib.resources.status.NextcloudVersion;
 import com.owncloud.android.lib.resources.status.OCCapability;
 import com.owncloud.android.operations.common.SyncOperation;
 import com.owncloud.android.operations.e2e.E2EClientData;
@@ -475,12 +476,15 @@ protected RemoteOperationResult run(OwnCloudClient client) {
         final boolean isResumingEncryptedUpload = (mFolderUnlockToken != null && !mFolderUnlockToken.isEmpty());
         if (!isResumingEncryptedUpload && (parent == null || mRemoteFolderToBeCreated)) {
             Log_OC.d(TAG, "verifying remote parent folder exists: " + remoteParentPath);
-            final var result = grantFolderExistence(remoteParentPath, client);
 
-            if (!result.isSuccess()) {
-                Log_OC.e(TAG, "grantFolderExistence failed for: " + remoteParentPath + ", code: " +
-                    result.getCode() + ", message: " + result.getMessage());
-                return result;
+            if (!getCapabilities().getVersion().isNewerOrEqual(NextcloudVersion.nextcloud_32)) {
+                // No automatic folder creation before Nextcloud 32, create them
+                final var result = grantFolderExistence(remoteParentPath, client);
+                if (!result.isSuccess()) {
+                    Log_OC.e(TAG, "grantFolderExistence failed for: " + remoteParentPath + ", code: " +
+                        result.getCode() + ", message: " + result.getMessage());
+                    return result;
+                }
             }
 
             parent = getStorageManager().getFileByPath(remoteParentPath);
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8ea32ee9c59b..deb97a3d9166 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@
 androidCommonLibraryVersion = "f46fb3b6789dee1f476269903da61e9b48c99587"
 androidGifDrawableVersion = "1.2.32"
 androidImageCropperVersion = "4.7.0"
-androidLibraryVersion ="d22a01f4b8327b6593d6af75f6be3aa7fbc2c854"
+androidLibraryVersion ="23b7bc1dbc7be64caf3bb00f06c9fa8b618ad144"
 androidOpensslVersion = "3.5.6"
 androidPluginVersion = "9.4.0"
 androidsvgVersion = "1.4"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index bed32c794130..050ef31ee51c 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -21169,6 +21169,14 @@
             <sha256 value="ced0eaec0b05aa707bf2e4f3481722532221dd0bee0d0a7e4c288bf9b0f5ca91" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="23b7bc1dbc7be64caf3bb00f06c9fa8b618ad144">
+         <artifact name="android-library-23b7bc1dbc7be64caf3bb00f06c9fa8b618ad144.aar">
+            <sha256 value="f1e5006dba6b0b60466ef880e6c35aeea4bab265f9f843eff4045ed4f031d7d9" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="android-library-23b7bc1dbc7be64caf3bb00f06c9fa8b618ad144.module">
+            <sha256 value="f751905158bc22a55af98cdd3aa484b0aab973e612f271514a0d3d58afd2b5ff" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="25bd90c0f21b9b16acee6a7f433063040c75f30d">
          <artifact name="android-library-25bd90c0f21b9b16acee6a7f433063040c75f30d.aar">
             <sha256 value="4fe766c7f7359013ed072d60062996dd98358c8a7ed8d90c71285c373ee23f12" origin="Generated by Gradle" reason="Artifact is not signed"/>