diff --git a/apps/web/src/app/(shares)/reverse-shares/components/edit-reverse-share-modal.tsx b/apps/web/src/app/(shares)/reverse-shares/components/edit-reverse-share-modal.tsx
index 682a7da..e9a56ca 100644
--- a/apps/web/src/app/(shares)/reverse-shares/components/edit-reverse-share-modal.tsx
+++ b/apps/web/src/app/(shares)/reverse-shares/components/edit-reverse-share-modal.tsx
@@ -120,10 +120,11 @@ function mapReverseShareToFormData(reverseShare: ReverseShare): EditReverseShare
     pageLayout: (reverseShare.pageLayout as "DEFAULT" | "WETRANSFER") || DEFAULT_VALUES.PAGE_LAYOUT,
     nameFieldRequired: (reverseShare.nameFieldRequired as "HIDDEN" | "OPTIONAL" | "REQUIRED") || "OPTIONAL",
     emailFieldRequired: (reverseShare.emailFieldRequired as "HIDDEN" | "OPTIONAL" | "REQUIRED") || "OPTIONAL",
-    hasExpiration: false,
-    hasFileLimits: false,
-    hasFieldRequirements: false,
-    hasPassword: false,
+    hasExpiration: !!reverseShare.expiration,
+    hasFileLimits: !!(reverseShare.maxFiles || reverseShare.maxFileSize || reverseShare.allowedFileTypes),
+    hasFieldRequirements:
+      reverseShare.nameFieldRequired !== "OPTIONAL" || reverseShare.emailFieldRequired !== "OPTIONAL",
+    hasPassword: reverseShare.hasPassword,
     password: DEFAULT_VALUES.EMPTY_STRING,
     isActive: reverseShare.isActive,
     noFilesLimit: !reverseShare.maxFiles,