diff --git a/plugins/scaffolder/src/api.ts b/plugins/scaffolder/src/api.ts
index 8dc11ef296..25f76c029a 100644
--- a/plugins/scaffolder/src/api.ts
+++ b/plugins/scaffolder/src/api.ts
@@ -41,7 +41,10 @@ import {
 } from '@backstage/plugin-scaffolder-react';
 
 import queryString from 'qs';
-import { fetchEventSource } from '@microsoft/fetch-event-source';
+import {
+  EventSourceMessage,
+  fetchEventSource,
+} from '@microsoft/fetch-event-source';
 
 /**
  * An API to interact with the scaffolder backend.
@@ -244,7 +247,7 @@ export class ScaffolderClient implements ScaffolderApi {
 
           fetchEventSource(url, {
             fetch: this.fetchApi.fetch,
-            onmessage(e: any) {
+            onmessage(e: EventSourceMessage) {
               if (e.event === 'log') {
                 processEvent(e);
                 return;
diff --git a/plugins/techdocs/api-report.md b/plugins/techdocs/api-report.md
index 582e941507..b756bc0ab0 100644
--- a/plugins/techdocs/api-report.md
+++ b/plugins/techdocs/api-report.md
@@ -465,6 +465,7 @@ export class TechDocsStorageClient implements TechDocsStorageApi_2 {
     configApi: Config;
     discoveryApi: DiscoveryApi;
     fetchApi: FetchApi;
+    identityApi?: any;
   });
   // (undocumented)
   configApi: Config;
diff --git a/plugins/techdocs/src/client.ts b/plugins/techdocs/src/client.ts
index b79c140750..06362825a1 100644
--- a/plugins/techdocs/src/client.ts
+++ b/plugins/techdocs/src/client.ts
@@ -126,6 +126,8 @@ export class TechDocsStorageClient implements TechDocsStorageApi {
     configApi: Config;
     discoveryApi: DiscoveryApi;
     fetchApi: FetchApi;
+    // @deprecated Remove identityApiRef
+    identityApi?: any;
   }) {
     this.configApi = options.configApi;
     this.discoveryApi = options.discoveryApi;
@@ -212,7 +214,9 @@ export class TechDocsStorageClient implements TechDocsStorageApi {
         fetch: this.fetchApi.fetch,
         onmessage(e: any) {
           if (e.event === 'log') {
-            logHandler(JSON.parse(e.data));
+            if (e.data) {
+              logHandler(JSON.parse(e.data));
+            }
           } else if (e.event === 'finish') {
             let updated: boolean = false;
             if (e.data) {
diff --git a/plugins/techdocs/src/plugin.ts b/plugins/techdocs/src/plugin.ts
index efa6bdfc1f..9d4157ba9e 100644
--- a/plugins/techdocs/src/plugin.ts
+++ b/plugins/techdocs/src/plugin.ts
@@ -31,6 +31,7 @@ import {
   createRoutableExtension,
   discoveryApiRef,
   fetchApiRef,
+  identityApiRef,
 } from '@backstage/core-plugin-api';
 import {
   createSearchResultListItemExtension,
@@ -51,13 +52,18 @@ export const techdocsPlugin = createPlugin({
       deps: {
         configApi: configApiRef,
         discoveryApi: discoveryApiRef,
+        /**
+         * @deprecated fetchApi is enough
+         */
+        identityApi: identityApiRef,
         fetchApi: fetchApiRef,
       },
-      factory: ({ configApi, discoveryApi, fetchApi }) =>
+      factory: ({ configApi, discoveryApi, fetchApi, identityApi = null }) =>
         new TechDocsStorageClient({
           configApi,
           discoveryApi,
           fetchApi,
+          identityApi,
         }),
     }),
     createApiFactory({