diff --git a/ts/components/SafetyNumberViewer.stories.tsx b/ts/components/SafetyNumberViewer.stories.tsx
index 258691e75..07734b3ae 100644
--- a/ts/components/SafetyNumberViewer.stories.tsx
+++ b/ts/components/SafetyNumberViewer.stories.tsx
@@ -70,7 +70,7 @@ const createProps = (overrideProps: Partial<PropsType> = {}): PropsType => ({
   i18n,
   safetyNumber:
     'safetyNumber' in overrideProps
-      ? overrideProps.safetyNumber
+      ? overrideProps.safetyNumber ?? null
       : {
           numberBlocks: generateNumberBlocks(),
           qrData: generateQRData(),
diff --git a/ts/components/SafetyNumberViewer.tsx b/ts/components/SafetyNumberViewer.tsx
index 03f8b3198..76aedb35a 100644
--- a/ts/components/SafetyNumberViewer.tsx
+++ b/ts/components/SafetyNumberViewer.tsx
@@ -17,9 +17,9 @@ export type PropsType = {
   generateSafetyNumber: (contact: ConversationType) => void;
   i18n: LocalizerType;
   onClose: () => void;
-  safetyNumber?: SafetyNumberType;
+  safetyNumber: SafetyNumberType | null;
   toggleVerified: (contact: ConversationType) => void;
-  verificationDisabled: boolean;
+  verificationDisabled: boolean | null;
 };
 
 export function SafetyNumberViewer({
@@ -108,7 +108,7 @@ export function SafetyNumberViewer({
 
       <div className="module-SafetyNumberViewer__button">
         <Button
-          disabled={verificationDisabled}
+          disabled={verificationDisabled ?? false}
           onClick={() => {
             toggleVerified(contact);
           }}
diff --git a/ts/state/selectors/safetyNumber.ts b/ts/state/selectors/safetyNumber.ts
index f10ee0898..aa3fd0a47 100644
--- a/ts/state/selectors/safetyNumber.ts
+++ b/ts/state/selectors/safetyNumber.ts
@@ -23,5 +23,5 @@ export const getContactSafetyNumber = createSelector(
   (
     { contacts }: SafetyNumberStateType,
     contactID: string
-  ): SafetyNumberContactType => contacts[contactID]
+  ): SafetyNumberContactType | void => contacts[contactID]
 );
diff --git a/ts/state/smart/SafetyNumberModal.tsx b/ts/state/smart/SafetyNumberModal.tsx
index 1a6372db5..1df56761e 100644
--- a/ts/state/smart/SafetyNumberModal.tsx
+++ b/ts/state/smart/SafetyNumberModal.tsx
@@ -29,8 +29,8 @@ export const SmartSafetyNumberModal = memo(function SmartSafetyNumberModal({
     <SafetyNumberModal
       i18n={i18n}
       contact={contact}
-      safetyNumber={contactSafetyNumber.safetyNumber}
-      verificationDisabled={contactSafetyNumber.verificationDisabled}
+      safetyNumber={contactSafetyNumber?.safetyNumber ?? null}
+      verificationDisabled={contactSafetyNumber?.verificationDisabled ?? null}
       toggleSafetyNumberModal={toggleSafetyNumberModal}
       generateSafetyNumber={generateSafetyNumber}
       toggleVerified={toggleVerified}
diff --git a/ts/state/smart/SafetyNumberViewer.tsx b/ts/state/smart/SafetyNumberViewer.tsx
index 0b036db91..011e59ed5 100644
--- a/ts/state/smart/SafetyNumberViewer.tsx
+++ b/ts/state/smart/SafetyNumberViewer.tsx
@@ -30,9 +30,9 @@ export const SmartSafetyNumberViewer = memo(function SmartSafetyNumberViewer({
       generateSafetyNumber={generateSafetyNumber}
       i18n={i18n}
       onClose={onClose}
-      safetyNumber={safetyNumberContact.safetyNumber}
+      safetyNumber={safetyNumberContact?.safetyNumber ?? null}
       toggleVerified={toggleVerified}
-      verificationDisabled={safetyNumberContact.verificationDisabled}
+      verificationDisabled={safetyNumberContact?.verificationDisabled ?? null}
     />
   );
 });