diff --git a/plugins/techdocs-backend/src/service/router.test.ts b/plugins/techdocs-backend/src/service/router.test.ts
index c74167552d..21b6dd5554 100644
--- a/plugins/techdocs-backend/src/service/router.test.ts
+++ b/plugins/techdocs-backend/src/service/router.test.ts
@@ -164,7 +164,14 @@ describe('createRouter', () => {
           .set('accept', 'text/event-stream')
           .send();
 
-        expect(response.status).toBe(404);
+        expect(response.status).toBe(200);
+        expect(response.get('content-type')).toBe('text/event-stream');
+        expect(response.text).toEqual(
+          `event: error
+data: "Entity not found"
+
+`,
+        );
       });
 
       it('should return not found if entity has no uid', async () => {
@@ -179,7 +186,14 @@ describe('createRouter', () => {
           .set('accept', 'text/event-stream')
           .send();
 
-        expect(response.status).toBe(404);
+        expect(response.status).toBe(200);
+        expect(response.get('content-type')).toBe('text/event-stream');
+        expect(response.text).toEqual(
+          `event: error
+data: "Entity metadata UID missing"
+
+`,
+        );
       });
 
       it('should not check for an update when shouldBuild returns false', async () => {
diff --git a/plugins/techdocs-backend/src/service/router.ts b/plugins/techdocs-backend/src/service/router.ts
index 4d5ba0ebf3..301bc43755 100644
--- a/plugins/techdocs-backend/src/service/router.ts
+++ b/plugins/techdocs-backend/src/service/router.ts
@@ -246,7 +246,11 @@ export async function createRouter(
 
     const entity = await entityLoader.load({ kind, namespace, name }, token);
     if (!entity?.metadata?.uid) {
-      responseHandler.error(new NotFoundError('Entity metadata UID missing'));
+      responseHandler.error(
+        new NotFoundError(
+          entity ? 'Entity metadata UID missing' : 'Entity not found',
+        ),
+      );
       return;
     }