diff --git a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts
index e60c95076e98ca10efd497ca91ec35114653f539..91d42f600402a7a65dff32dfb3eefdc6e2eda4aa 100644
--- a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts
+++ b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts
@@ -977,7 +977,7 @@ describe('BescheidService', () => {
     it('should set create beschied document in progress', () => {
       service.createBescheidDocument();
 
-      expect(service.createBescheidDocumentInProgress$.value.loading).toBeTruthy();
+      expect(service.createBescheidDocumentInProgress$.value).toEqual(commandStateResource);
     });
 
     it('should set upload beschied document in progress loading false', () => {
diff --git a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts
index 90dbfa4346be7cf37beb1daf7bdbcd5c7db348be..192498752d4b4195b6eebce4995c441a0b87f3b0 100644
--- a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts
+++ b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts
@@ -429,9 +429,8 @@ export class BescheidService {
   private handleCreateBescheidDocumentResponse(
     commandStateResource: StateResource<CommandResource>,
   ): void {
-    if (hasCommandError(commandStateResource.resource)) {
-      this.createBescheidDocumentInProgress$.next(commandStateResource);
-    } else {
+    this.createBescheidDocumentInProgress$.next(commandStateResource);
+    if (!hasCommandError(commandStateResource.resource)) {
       const documentUri: ResourceUri = getEffectedResourceUrl(commandStateResource.resource);
       this.bescheidDocumentUri$.next(documentUri);
       this.loadBescheidDocumentByUri(documentUri);