diff --git a/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt b/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt
index e58d8b8ab1d1..a66ade26991a 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/BackgroundJobFactory.kt
@@ -17,7 +17,6 @@ import androidx.work.WorkerFactory
 import androidx.work.WorkerParameters
 import com.nextcloud.client.account.UserAccountManager
 import com.nextcloud.client.core.Clock
-import com.nextcloud.client.device.DeviceInfo
 import com.nextcloud.client.device.PowerManagementService
 import com.nextcloud.client.documentscan.GeneratePDFUseCase
 import com.nextcloud.client.documentscan.GeneratePdfFromImagesWork
@@ -49,7 +48,6 @@ class BackgroundJobFactory @Inject constructor(
     private val clock: Clock,
     private val powerManagementService: PowerManagementService,
     private val backgroundJobManager: Provider<BackgroundJobManager>,
-    private val deviceInfo: DeviceInfo,
     private val accountManager: UserAccountManager,
     private val resources: Resources,
     private val arbitraryDataProvider: ArbitraryDataProvider,
diff --git a/app/src/main/java/com/owncloud/android/datamodel/UploadsStorageManager.java b/app/src/main/java/com/owncloud/android/datamodel/UploadsStorageManager.java
index 9f238ef0edc2..ed7e8f7dd9c3 100644
--- a/app/src/main/java/com/owncloud/android/datamodel/UploadsStorageManager.java
+++ b/app/src/main/java/com/owncloud/android/datamodel/UploadsStorageManager.java
@@ -236,7 +236,9 @@ private int updateUploadInternal(Cursor c, UploadStatus status, UploadResult res
                     + upload.toFormattedString() + ')');
 
             upload.setUploadStatus(status);
-            upload.setLastResult(result);
+            if (result != null) {
+                upload.setLastResult(result);
+            }
             upload.setRemotePath(remotePath);
             if (localPath != null) {
                 upload.setLocalPath(localPath);
diff --git a/app/src/main/java/com/owncloud/android/db/OCUpload.java b/app/src/main/java/com/owncloud/android/db/OCUpload.java
index 167e9432e003..8e2250bb65ff 100644
--- a/app/src/main/java/com/owncloud/android/db/OCUpload.java
+++ b/app/src/main/java/com/owncloud/android/db/OCUpload.java
@@ -188,7 +188,7 @@ public void setDataFixed(FileUploadHelper uploadHelper) {
      */
     public void setUploadStatus(UploadStatus uploadStatus) {
         this.uploadStatus = uploadStatus;
-        setLastResult(UploadResult.UNKNOWN);
+        // setLastResult(UploadResult.UNKNOWN);
     }
 
     /**
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
index b2688551e50e..13df9f64e1f0 100755
--- a/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
@@ -61,6 +61,8 @@
 
 import androidx.annotation.NonNull;
 
+import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.QUOTA_EXCEEDED;
+
 /**
  * This Adapter populates a ListView with following types of uploads: pending, active, completed. Filtering possible.
  */
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cf1866a5a7d4..cee9df4a5366 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1348,4 +1348,5 @@
     <string name="sync_duplication">Sync duplication</string>
     <string name="server_not_reachable">Could not load content</string>
     <string name="server_not_reachable_content">The device is likely not connected to the internet</string>
+    <string name="quota_exceeded">Quota exceeded. Free up some space on server.</string>
 </resources>
diff --git a/app/src/test/java/com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt b/app/src/test/java/com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt
index 7269b9d1eebf..b315e0f8e5c8 100644
--- a/app/src/test/java/com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt
+++ b/app/src/test/java/com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt
@@ -111,7 +111,6 @@ class BackgroundJobFactoryTest {
             clock,
             powerManagementService,
             { backgroundJobManager },
-            deviceInfo,
             accountManager,
             resources,
             dataProvider,