diff --git a/apps/google-analytics-4/frontend/src/apis/apiTypes.ts b/apps/google-analytics-4/frontend/src/apis/apiTypes.ts
index d87adc6c5c..7a173899c5 100644
--- a/apps/google-analytics-4/frontend/src/apis/apiTypes.ts
+++ b/apps/google-analytics-4/frontend/src/apis/apiTypes.ts
@@ -52,13 +52,13 @@ export const ZRunReportData = z.object({
   minimums: z.array(ZRow),
   rowCount: z.number(),
   metadata: z.object({
-    currencyCode: z.string(),
+    currencyCode: z.string().optional(),
     dataLossFromOtherRow: z.boolean(),
-    timeZone: z.string(),
-    _currencyCode: z.string(),
-    _timeZone: z.string(),
+    timeZone: z.string().optional(),
+    _currencyCode: z.string().optional(),
+    _timeZone: z.string().optional(),
   }),
-  propertyQuota: z.null(),
+  propertyQuota: z.unknown(),
   kind: z.string(),
 });
 
diff --git a/apps/google-analytics-4/frontend/src/locations/Sidebar.tsx b/apps/google-analytics-4/frontend/src/locations/Sidebar.tsx
index 1984f175b9..41ac0d8a2a 100644
--- a/apps/google-analytics-4/frontend/src/locations/Sidebar.tsx
+++ b/apps/google-analytics-4/frontend/src/locations/Sidebar.tsx
@@ -1,5 +1,5 @@
 import AnalyticsApp from 'components/main-app/AnalyticsApp/AnalyticsApp';
-import { useCMA, useSDK } from '@contentful/react-apps-toolkit';
+import { useSDK } from '@contentful/react-apps-toolkit';
 import { SidebarExtensionSDK } from '@contentful/app-sdk';
 import { useMemo } from 'react';
 import { Skeleton } from '@contentful/f36-components';
@@ -13,7 +13,6 @@ import { contentfulContext } from 'helpers/contentfulContext';
 
 const Sidebar = () => {
   const sdk = useSDK<SidebarExtensionSDK>();
-  const cma = useCMA();
   const installationParameters = sdk.parameters.installation as
     | AppInstallationParameters
     | undefined;
@@ -26,8 +25,8 @@ const Sidebar = () => {
     (rule) => rule.contentTypeId === currentContentType
   );
   const api = useMemo(
-    () => new Api(contentfulContext(sdk), cma, serviceAccountKeyId),
-    [cma, sdk, serviceAccountKeyId]
+    () => new Api(contentfulContext(sdk), sdk.cma, serviceAccountKeyId),
+    [sdk, serviceAccountKeyId]
   );
 
   const hasInstallationParams = serviceAccountKeyId && propertyId;