diff --git a/features/admin.organizations.v1/components/edit-organization/organization-attributes.tsx b/features/admin.organizations.v1/components/edit-organization/organization-attributes.tsx
index 25a643318a7..38f646705d1 100644
--- a/features/admin.organizations.v1/components/edit-organization/organization-attributes.tsx
+++ b/features/admin.organizations.v1/components/edit-organization/organization-attributes.tsx
@@ -177,7 +177,7 @@ export const OrganizationAttributes: FunctionComponent<OrganizationAttributesPro
     );
 
     return (
-        <EmphasizedSegment key={ organization.id } >
+        <EmphasizedSegment key={ organization?.id } >
             <Grid>
                 <Grid.Row columns={ 1 }>
                     <Grid.Column