diff --git a/app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt b/app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt
index 1851113ebab2..94fb4ff31a4a 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/autoUpload/AutoUploadWorker.kt
@@ -369,6 +369,11 @@ class AutoUploadWorker(
                                 return@withContext
                             }
 
+                            if (result.code == ResultCode.QUOTA_EXCEEDED) {
+                                Log_OC.w(TAG, "quota exceeded, stopping auto upload")
+                                return@withContext
+                            }
+
                             // Mark CONFLICT files as handled to prevent retries
                             if (result.code.isConflict()) {
                                 repository.markFileAsHandled(localPath, syncedFolder)
diff --git a/app/src/main/java/com/nextcloud/client/jobs/upload/AlbumFileUploadWorker.kt b/app/src/main/java/com/nextcloud/client/jobs/upload/AlbumFileUploadWorker.kt
index e36a8972c201..007796a8821b 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/upload/AlbumFileUploadWorker.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/upload/AlbumFileUploadWorker.kt
@@ -274,7 +274,7 @@ class AlbumFileUploadWorker(
             if (result.code == ResultCode.QUOTA_EXCEEDED) {
                 Log_OC.w(TAG, "Quota exceeded, stopping uploads")
                 notificationManager.showQuotaExceedNotification(operation)
-                break
+                return@withContext Result.failure()
             }
 
             sendUploadFinishEvent(totalUploadSize, currentUploadIndex, operation, result)
diff --git a/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt b/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt
index e698f3850869..115661b64c19 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt
@@ -350,7 +350,7 @@ class FileUploadWorker(
             if (result.code == ResultCode.QUOTA_EXCEEDED) {
                 Log_OC.w(TAG, "Quota exceeded, stopping uploads")
                 notificationManager.showQuotaExceedNotification(operation)
-                break
+                return@withContext Result.failure()
             }
 
             if (!result.isSuccess && !result.code.isUserCancellation()) {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5549ae0df79e..433c2a34ad01 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@
 androidCommonLibraryVersion = "e72c899b0cf0f456aabe4816cf07548abd8828e9"
 androidGifDrawableVersion = "1.2.32"
 androidImageCropperVersion = "4.7.0"
-androidLibraryVersion ="42ca8fd5598ac7c8320a985563f9ecf606a06d87"
+androidLibraryVersion ="36c60a34dd"
 androidOpensslVersion = "3.5.6.1"
 androidPluginVersion = "9.4.1"
 androidsvgVersion = "1.4"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index dbf78ed17227..bbb85b5c5b40 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -22567,6 +22567,14 @@
             <sha256 value="803eeabdbf8e78808a42986a9e6ec7d5e7e74ec9024a38a577898ef699f504db" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="36c60a34dd">
+         <artifact name="android-library-36c60a34dd.aar">
+            <sha256 value="e5620b63d4686654a1a595f5f255972c5050ec1c7ff2086afa9f24bd0badc19c" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-36c60a34dd.module">
+            <sha256 value="f89245e58b5bbf0c26d1bd7db208941aacc0b0ae1844b2c868003b85c5c3e668" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="38328f338c00870c6a062188974f8f30a61fb450">
          <artifact name="android-library-38328f338c00870c6a062188974f8f30a61fb450.aar">
             <sha256 value="05b55bc24c2f1c5b30cd74ccde6b506b7b0c40411c0282d9adf838635fb3328d" origin="Generated by Gradle" reason="Artifact is not signed"/>