diff --git a/libs/handoversidesheet/src/lib/types.ts b/libs/handoversidesheet/src/lib/types.ts
index e45225de..da518a6b 100644
--- a/libs/handoversidesheet/src/lib/types.ts
+++ b/libs/handoversidesheet/src/lib/types.ts
@@ -84,25 +84,25 @@ export type HandoverUnsignedTask = {
 } & HandoverChild;
 
 export type HandoverWorkOrder = {
-  workOrderNumber: string;
-  workOrderId: string;
-  workOrderUrlId: string;
-  projectProgress: number | null;
-  title: string;
-  jobStatus: string;
-  materialStatus: string;
-  commissioningPackageUrl: string;
-  facility: string;
-  discipline: string;
-  workOrderUrl: string | null;
-  actualCompletionDate: string | null;
-  plannedFinishDate: string | null;
-  remainingHours: number | null;
-  estimatedHours: number | null;
-  responsible: string;
-  workBreakdownStructure: string;
-  commpkgId: string | null;
-  commissioningPackageUrlId: string | null;
-  commpkgNumber: string | null;
+  workOrderNumber: string
+  workOrderId: string
+  workOrderUrlId: string
+  projectProgress: number
+  title: string
+  jobStatus: string
+  materialStatus: string
+  commissioningPackageUrl: string
+  facility: string
+  discipline: string
+  workOrderUrl: string
+  actualCompletionDate: string
+  plannedFinishDate: string
+  remainingHours: number
+  estimatedHours: number
+  responsible: string
+  workBreakdownStructure: string
+  commpkgId: string
+  commissioningPackageUrlId: string
+  commpkgNumber: string
 } & HandoverChild;
 
diff --git a/libs/handoversidesheet/src/lib/ui-sidesheet/HandoverSidesheet.tsx b/libs/handoversidesheet/src/lib/ui-sidesheet/HandoverSidesheet.tsx
index 3ff986ae..00f3d35a 100644
--- a/libs/handoversidesheet/src/lib/ui-sidesheet/HandoverSidesheet.tsx
+++ b/libs/handoversidesheet/src/lib/ui-sidesheet/HandoverSidesheet.tsx
@@ -23,7 +23,6 @@ import {
   SwcrTab,
   UnsignedActionTab,
   UnsignedTaskTab,
-  WorkorderBase,
   WorkorderTab,
   useContextId,
 } from '@cc-components/shared';
@@ -251,7 +250,7 @@ const HandoverSidesheetComponent = (props: Required<HandoverProps>) => {
           </StyledPanel>
           <StyledPanel>
             <WorkorderTab
-              workorders={workOrderPackages}
+              workorders={(workOrderPackages ?? [])}
               isFetching={isDataFetchingWorkOrder}
               error={woError}
             />