diff --git a/src/react/databrowser/objects/__tests__/ObjectLockSetting.test.tsx b/src/react/databrowser/objects/__tests__/ObjectLockSetting.test.tsx
index f4c7bc834..86d5f1304 100644
--- a/src/react/databrowser/objects/__tests__/ObjectLockSetting.test.tsx
+++ b/src/react/databrowser/objects/__tests__/ObjectLockSetting.test.tsx
@@ -42,7 +42,7 @@ describe('ObjectLockSetting', () => {
             bucketName: 'test-bucket',
             objectRetention: {
               mode: 'GOVERNANCE',
-              retainUntilDate: '2022-01-31 00:00:00"',
+              retainUntilDate: new Date('2022-01-31 00:00:00'),
             },
           },
         },
@@ -72,7 +72,7 @@ describe('ObjectLockSetting', () => {
             bucketName: 'test-bucket',
             objectRetention: {
               mode: 'COMPLIANCE',
-              retainUntilDate: '2022-01-31 00:00:00"',
+              retainUntilDate: new Date('2022-01-31 00:00:00'),
             },
           },
         },
diff --git a/src/react/databrowser/objects/details/Properties.tsx b/src/react/databrowser/objects/details/Properties.tsx
index 269856c12..ed57106e8 100644
--- a/src/react/databrowser/objects/details/Properties.tsx
+++ b/src/react/databrowser/objects/details/Properties.tsx
@@ -2,7 +2,7 @@
 import Table, * as T from '../../../ui-elements/TableKeyValue2';
 import { Clipboard } from '../../../ui-elements/Clipboard';
 import MiddleEllipsis from '../../../ui-elements/MiddleEllipsis';
-import type { ObjectMetadata } from '../../../../types/s3';
+import type { ObjectEntity, ObjectMetadata } from '../../../../types/s3';
 import {
   FormattedDateTime,
   Icon,
@@ -31,7 +31,7 @@ import {
 } from '../../../ui-elements/Veeam/VeeamConstants';
 
 type Props = {
-  objectMetadata: ObjectMetadata;
+  objectMetadata: ObjectMetadata & { lockStatus?: ObjectEntity['lockStatus'] };
 };
 const TruncatedValue = styled.div`
   max-width: 18rem;
@@ -203,47 +203,38 @@ function Properties({ objectMetadata }: Props) {
                 <T.Key> Lock </T.Key>
                 <T.GroupValues>
                   <div>
-                    {
-                      //@ts-expect-error fix this when you are working on it
-                      objectMetadata.lockStatus === 'LOCKED' && (
-                        <>
-                          Locked <Icon name="Lock" /> (
-                          {objectMetadata.objectRetention.mode.toLowerCase()})
-                          <br />
-                          until{' '}
-                          <FormattedDateTime
-                            format="date-time-second"
-                            value={
-                              new Date(
-                                objectMetadata.objectRetention.retainUntilDate,
-                              )
-                            }
-                          />
-                        </>
-                      )
-                    }
-                    {
-                      //@ts-expect-error fix this when you are working on it
-                      objectMetadata.lockStatus === 'RELEASED' && (
-                        <>
-                          Released <Icon name="Lock-open" />
-                          <br />
-                          since{' '}
-                          <FormattedDateTime
-                            format="date-time-second"
-                            value={
-                              new Date(
-                                objectMetadata.objectRetention.retainUntilDate,
-                              )
-                            }
-                          />
-                        </>
-                      )
-                    }
-                    {
-                      //@ts-expect-error fix this when you are working on it
-                      objectMetadata.lockStatus === 'NONE' && 'No retention'
-                    }
+                    {objectMetadata.lockStatus === 'LOCKED' && (
+                      <>
+                        Locked <Icon name="Lock" /> (
+                        {objectMetadata.objectRetention.mode.toLowerCase()})
+                        <br />
+                        until{' '}
+                        <FormattedDateTime
+                          format="date-time-second"
+                          value={
+                            new Date(
+                              objectMetadata.objectRetention.retainUntilDate,
+                            )
+                          }
+                        />
+                      </>
+                    )}
+                    {objectMetadata.lockStatus === 'RELEASED' && (
+                      <>
+                        Released <Icon name="Lock-open" />
+                        <br />
+                        since{' '}
+                        <FormattedDateTime
+                          format="date-time-second"
+                          value={
+                            new Date(
+                              objectMetadata.objectRetention.retainUntilDate,
+                            )
+                          }
+                        />
+                      </>
+                    )}
+                    {objectMetadata.lockStatus === 'NONE' && 'No retention'}
                   </div>
                   {isObjectLockEnabled && (
                     <Button
diff --git a/src/react/databrowser/objects/details/__tests__/Properties.test.tsx b/src/react/databrowser/objects/details/__tests__/Properties.test.tsx
index 70a834e0b..353d9f1d6 100644
--- a/src/react/databrowser/objects/details/__tests__/Properties.test.tsx
+++ b/src/react/databrowser/objects/details/__tests__/Properties.test.tsx
@@ -18,7 +18,9 @@ import Properties from '../Properties';
 import { getConfigOverlay } from '../../../../../js/mock/managementClientMSWHandlers';
 
 const renderProperties = (
-  component: React.ReactNode = <Properties objectMetadata={OBJECT_METADATA} />,
+  component: React.ReactNode = (
+    <Properties objectMetadata={{ ...OBJECT_METADATA, lockStatus: 'NONE' }} />
+  ),
   state = {},
 ) => {
   return renderWithRouterMatch(