diff --git a/alfa-client/libs/kommentar-shared/src/lib/kommentar.service.spec.ts b/alfa-client/libs/kommentar-shared/src/lib/kommentar.service.spec.ts
index 1ceecd9e1f16e3309e234235887150f8e5c6ee3a..522ed1f6ce6a4ae086d1226253f1d1236eb3eb9d 100644
--- a/alfa-client/libs/kommentar-shared/src/lib/kommentar.service.spec.ts
+++ b/alfa-client/libs/kommentar-shared/src/lib/kommentar.service.spec.ts
@@ -259,6 +259,23 @@ describe('KommentarService', () => {
   });
 
   describe('onNavigation', () => {
+    beforeEach(() => {
+      service.clearUploadedFiles = jest.fn();
+      service.hideFormular = jest.fn();
+    });
+
+    it('should clear uploaded files', () => {
+      service.onNavigation({});
+
+      expect(service.clearUploadedFiles).toHaveBeenCalled();
+    });
+
+    it('should hide forumlar', () => {
+      service.onNavigation({});
+
+      expect(service.hideFormular).toHaveBeenCalled();
+    });
+
     describe('to vorgang list', () => {
       it('should set reload flag of kommentar list', () => {
         service.kommentarList$.next(createEmptyStateResource());
diff --git a/alfa-client/libs/kommentar-shared/src/lib/kommentar.service.ts b/alfa-client/libs/kommentar-shared/src/lib/kommentar.service.ts
index 6749d94ff0079091abf5f3a42d6c67786b171d08..0055824e34836c3ad1195ce85d01ff4f2b772a35 100644
--- a/alfa-client/libs/kommentar-shared/src/lib/kommentar.service.ts
+++ b/alfa-client/libs/kommentar-shared/src/lib/kommentar.service.ts
@@ -42,7 +42,7 @@ export class KommentarService {
     createEmptyStateResource<KommentarListResource>(),
   );
   readonly formularVisibility$: BehaviorSubject<boolean> = new BehaviorSubject(false);
-  readonly _currentlyEdited$: BehaviorSubject<ResourceUri> = new BehaviorSubject('');
+  readonly _currentlyEdited$: BehaviorSubject<ResourceUri> = new BehaviorSubject(EMPTY_STRING);
 
   private navigationSub: Subscription;
 
@@ -66,6 +66,8 @@ export class KommentarService {
   }
 
   onNavigation(params: Params): void {
+    this.clearUploadedFiles();
+    this.hideFormular();
     if (NavigationService.isVorgangListPage(params)) {
       this.setKommentarListOnReload();
     }