diff --git a/frontend/src/components/Select/Select.tsx b/frontend/src/components/Select/Select.tsx
index feeadd6d..ad39e6b6 100644
--- a/frontend/src/components/Select/Select.tsx
+++ b/frontend/src/components/Select/Select.tsx
@@ -29,10 +29,11 @@ const Select = (props: {
             </Listbox.Label>
             {props.readonly && (
               <span className="font-normal text-gray-900 sm:text-sm lg:text-base text-xs">
-                {props.selected &&
-                  (props.config.displayedAttribute
+                {props.selected
+                  ? props.config.displayedAttribute
                     ? props.selected[props.config.displayedAttribute]
-                    : props.selected)}
+                    : props.selected
+                  : '-'}
               </span>
             )}
             {!props.readonly && (
@@ -45,10 +46,10 @@ const Select = (props: {
                     {(props.config.displayedAttribute && props.selected
                       ? props.selected[props.config.displayedAttribute]
                       : props.selected) || (
-                        <span className="text-gray-700 font-normal sm:text-sm lg:text-base text-xs">
-                          {props.config.label}
-                        </span>
-                      )}
+                      <span className="text-gray-700 font-normal sm:text-sm lg:text-base text-xs">
+                        {props.config.label}
+                      </span>
+                    )}
                   </span>
                   <span className="absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none">
                     <ChevronUpDownIcon className="h-5 w-5 text-gray-400" aria-hidden="true" />
diff --git a/frontend/src/pages/organization/components/OrganizationGeneral/OrganizationGeneral.tsx b/frontend/src/pages/organization/components/OrganizationGeneral/OrganizationGeneral.tsx
index 00f5cc04..64d20fe6 100644
--- a/frontend/src/pages/organization/components/OrganizationGeneral/OrganizationGeneral.tsx
+++ b/frontend/src/pages/organization/components/OrganizationGeneral/OrganizationGeneral.tsx
@@ -564,24 +564,27 @@ const OrganizationGeneral = () => {
                   );
                 }}
               />
-              <Controller
-                key={OrganizationGeneralConfig.hasSameAddress.key}
-                name={OrganizationGeneralConfig.hasSameAddress.key}
-                control={control}
-                render={({ field: { onChange, value } }) => {
-                  return (
-                    <InputField
-                      config={{
-                        ...OrganizationGeneralConfig.hasSameAddress.config,
-                        defaultValue: value,
-                        onChange: onChange,
-                        id: 'create-organization-general__same-address-checkbox',
-                      }}
-                      disabled={readonly}
-                    />
-                  );
-                }}
-              />
+              {!readonly && (
+                <Controller
+                  key={OrganizationGeneralConfig.hasSameAddress.key}
+                  name={OrganizationGeneralConfig.hasSameAddress.key}
+                  control={control}
+                  render={({ field: { onChange, value } }) => {
+                    console.log(value);
+                    return (
+                      <InputField
+                        config={{
+                          ...OrganizationGeneralConfig.hasSameAddress.config,
+                          defaultValue: value,
+                          onChange: onChange,
+                          id: 'create-organization-general__same-address-checkbox',
+                        }}
+                        disabled={readonly}
+                      />
+                    );
+                  }}
+                />
+              )}
 
               <Controller
                 key={OrganizationGeneralConfig.organizationAddress.key}