diff --git a/CHANGELOG.md b/CHANGELOG.md
index 297024e330..909f5f5bec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ _**For better traceability add the corresponding GitHub issue number in each cha
 - #1122 Fixed editing notification sendTo attribute
 - #1328 Fixed semanticDataModel translation and part name within notification detail / edit view.
 - #908 Renamed header in notification detail for parts from Supplier Parts to Affected parts
+- #1151 Display of null values within contracts in datepicker to be empty if null
 
 ### Removed
 - #1227 Removed scrollbar on approval dialog
diff --git a/frontend/src/app/modules/page/admin/core/admin.model.ts b/frontend/src/app/modules/page/admin/core/admin.model.ts
index 03800752b4..967bd7b55a 100644
--- a/frontend/src/app/modules/page/admin/core/admin.model.ts
+++ b/frontend/src/app/modules/page/admin/core/admin.model.ts
@@ -90,7 +90,7 @@ export function assembleContract(contractResponse: ContractResponse): Contract {
     contractType: contractResponse.contractType,
     counterpartyAddress: contractResponse.counterpartyAddress,
     creationDate: new CalendarDateModel(contractResponse.creationDate),
-    endDate: new CalendarDateModel(contractResponse.endDate),
+    endDate: contractResponse.endDate !== null ? new CalendarDateModel(contractResponse.endDate): null,
     state: contractResponse.state,
     policy: contractResponse.policy,
     globalAssetId: contractResponse.globalAssetId,
diff --git a/frontend/src/app/modules/shared/components/table/table.component.html b/frontend/src/app/modules/shared/components/table/table.component.html
index 8dc637c776..7179d1eff6 100644
--- a/frontend/src/app/modules/shared/components/table/table.component.html
+++ b/frontend/src/app/modules/shared/components/table/table.component.html
@@ -427,7 +427,12 @@ <h3>{{ 'table.noResultFound' | i18n }}</h3>
           >
           </ng-container>
           <ng-container *ngIf="isDateElement(column)">
+          <ng-container *ngIf="element[column] !== null">
             {{ (element[column] | date:'yyyy-MM-dd HH:mm') }}
+          </ng-container>
+            <ng-container *ngIf="element[column] === null">
+              {{ (element[column]) }}
+            </ng-container>
           </ng-container>
           <ng-container *ngIf="isOwnerElement(column)">
             {{'table.owner.' + element[column]?.toLowerCase() | i18n}}