diff --git a/frontend/codegen.ts b/frontend/codegen.ts
index bd13804f5..80e9e2a73 100644
--- a/frontend/codegen.ts
+++ b/frontend/codegen.ts
@@ -10,6 +10,11 @@ const config: CodegenConfig = {
     // Inspired by https://www.apollographql.com/docs/react/development-testing/graphql-codegen#generating-precompiled-graphql-documents-with-their-type-definitions
     "./__generated__/graphql.ts": {
       plugins: ["typescript"],
+      config: {
+        scalars: {
+          Uuid: "string",
+        },
+      },
     },
     "./queries/": {
       preset: "near-operation-file",
diff --git a/frontend/components/DateTimeX.tsx b/frontend/components/DateTimeX.tsx
index fdd12a3e5..df2e7153b 100644
--- a/frontend/components/DateTimeX.tsx
+++ b/frontend/components/DateTimeX.tsx
@@ -1,9 +1,8 @@
 import { Calendar, Popover } from "antd";
 import dayjs from "dayjs";
-import { Scalars } from "../__generated__/graphql";
 
 interface DateTimeProps {
-  value: Scalars["DateTime"]["output"];
+  value: Parameters<typeof dayjs>[0];
 }
 
 export default function DateTimeX({ value }: DateTimeProps) {
diff --git a/frontend/pages/institutions/index.tsx b/frontend/pages/institutions/index.tsx
index 783fc8f64..914a176f9 100644
--- a/frontend/pages/institutions/index.tsx
+++ b/frontend/pages/institutions/index.tsx
@@ -31,8 +31,8 @@ export default function Page() {
         provides all information about institutions.
       </Typography.Paragraph>
       {currentUser?.roles?.includes(UserRole.Verifier) &&
-        currentUserData?.pendingInstitutions &&
-        currentUserData.pendingInstitutions.totalCount > 0 && (
+        currentUserData?.pendingInstitutionCount &&
+        currentUserData.pendingInstitutionCount > 0 && (
           <div>
             <Divider />
             <Typography.Title level={4}>Pending Institutions</Typography.Title>