diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts
index 8459bdb2b..ccb4e4d83 100644
--- a/apps/red-ui/src/app/app.module.ts
+++ b/apps/red-ui/src/app/app.module.ts
@@ -47,6 +47,7 @@ import { UserService } from '@services/user.service';
 import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
 import { ArchivedDossiersService } from '@services/dossiers/archived-dossiers.service';
 import { FeaturesService } from '@services/features.service';
+import { MAT_TOOLTIP_DEFAULT_OPTIONS } from '@angular/material/tooltip';
 
 export function httpLoaderFactory(httpClient: HttpClient, configService: ConfigService): PruningTranslationLoader {
     return new PruningTranslationLoader(httpClient, '/assets/i18n/', `.json?version=${configService.values.FRONTEND_APP_VERSION}`);
@@ -164,6 +165,12 @@ const components = [AppComponent, AuthErrorComponent, NotificationsComponent, Sp
             provide: ARCHIVED_DOSSIERS_SERVICE,
             useExisting: ArchivedDossiersService,
         },
+        {
+            provide: MAT_TOOLTIP_DEFAULT_OPTIONS,
+            useValue: {
+                disableTooltipInteractivity: true,
+            },
+        },
         DatePipe,
     ],
     bootstrap: [AppComponent],
diff --git a/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts b/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts
index cced682d8..0497e584a 100644
--- a/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts
+++ b/apps/red-ui/src/app/modules/upload-download/services/file-upload.service.ts
@@ -1,6 +1,6 @@
 import { ApplicationRef, Injectable, Injector, OnDestroy } from '@angular/core';
 import { FileUploadModel } from '../model/file-upload.model';
-import { HttpErrorResponse, HttpEventType } from '@angular/common/http';
+import { HttpErrorResponse, HttpEventType, HttpStatusCode } from '@angular/common/http';
 import { interval, Subject, Subscription } from 'rxjs';
 import { ConfigService } from '@services/config.service';
 import { TranslateService } from '@ngx-translate/core';
@@ -211,7 +211,7 @@ export class FileUploadService extends GenericService<IFileUploadResult> impleme
                     message: this._errorMessageService.getMessage(err, 'upload-status.error.generic'),
                 };
                 this._removeUpload(uploadFile);
-                if (uploadFile.retryCount < 5 && err.status !== 400) {
+                if (uploadFile.retryCount < 5 && ![HttpStatusCode.BadRequest, HttpStatusCode.Conflict].includes(err.status)) {
                     uploadFile.retryCount += 1;
                     this.scheduleUpload(uploadFile);
                 }
diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json
index 856aa676d..938c9abdb 100644
--- a/apps/red-ui/src/assets/i18n/de.json
+++ b/apps/red-ui/src/assets/i18n/de.json
@@ -1860,7 +1860,7 @@
     },
     "error": {
       "file-size": "Datei zu groß. Die maximal zulässige Größe beträgt {size} MB.",
-      "generic": "Fehler beim Hochladen des Dokuments"
+      "generic": "Fehler beim Hochladen des Dokuments. {error}"
     }
   },
   "user-listing": {
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index 676ff506c..c1a6547bd 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -1860,7 +1860,7 @@
     },
     "error": {
       "file-size": "File too large. Limit is {size}MB.",
-      "generic": "Failed to upload file. "
+      "generic": "Failed to upload file. {error}"
     }
   },
   "user-listing": {