diff --git a/src/components/Collections/CollectionShare/publicShare/index.tsx b/src/components/Collections/CollectionShare/publicShare/index.tsx
index 0b5007a1a..45bc24c46 100644
--- a/src/components/Collections/CollectionShare/publicShare/index.tsx
+++ b/src/components/Collections/CollectionShare/publicShare/index.tsx
@@ -37,15 +37,15 @@ export default function PublicShare({ collection }) {
                 setSharableLinkError={setSharableLinkError}
             />
             {publicShareUrl && (
-                <>
-                    <PublicShareLink publicShareUrl={publicShareUrl} />
-                    <PublicShareManage
-                        publicShareProp={publicShareProp}
-                        collection={collection}
-                        setPublicShareProp={setPublicShareProp}
-                        setSharableLinkError={setSharableLinkError}
-                    />
-                </>
+                <PublicShareLink publicShareUrl={publicShareUrl} />
+            )}
+            {publicShareProp && (
+                <PublicShareManage
+                    publicShareProp={publicShareProp}
+                    collection={collection}
+                    setPublicShareProp={setPublicShareProp}
+                    setSharableLinkError={setSharableLinkError}
+                />
             )}
         </>
     );
diff --git a/src/components/Collections/CollectionShare/publicShare/manage/linkPassword.tsx b/src/components/Collections/CollectionShare/publicShare/manage/linkPassword.tsx
index 0ab5edd13..85c63a813 100644
--- a/src/components/Collections/CollectionShare/publicShare/manage/linkPassword.tsx
+++ b/src/components/Collections/CollectionShare/publicShare/manage/linkPassword.tsx
@@ -41,7 +41,7 @@ export function ManageLinkPassword({
         <Box>
             <Typography> {constants.LINK_PASSWORD_LOCK}</Typography>
             <PublicShareSwitch
-                checked={publicShareProp?.passwordEnabled}
+                checked={!!publicShareProp?.passwordEnabled}
                 onChange={handlePasswordChangeSetting}
             />
         </Box>