diff --git a/components/HotelReservation/EnterDetails/SectionAccordion/index.tsx b/components/HotelReservation/EnterDetails/SectionAccordion/index.tsx
index b96ef8ef8..488d941b5 100644
--- a/components/HotelReservation/EnterDetails/SectionAccordion/index.tsx
+++ b/components/HotelReservation/EnterDetails/SectionAccordion/index.tsx
@@ -75,7 +75,11 @@ export default function SectionAccordion({
         </div>
       </div>
       <header className={styles.header}>
-        <button onClick={onModify} className={styles.modifyButton}>
+        <button
+          onClick={onModify}
+          disabled={!isComplete}
+          className={styles.modifyButton}
+        >
           <Footnote
             className={styles.title}
             asChild
@@ -94,7 +98,9 @@ export default function SectionAccordion({
           )}
         </button>
       </header>
-      <div className={styles.content}>{children}</div>
+      <div className={styles.content}>
+        <div className={styles.contentWrapper}>{children}</div>
+      </div>
     </div>
   )
 }
diff --git a/components/HotelReservation/EnterDetails/SectionAccordion/sectionAccordion.module.css b/components/HotelReservation/EnterDetails/SectionAccordion/sectionAccordion.module.css
index 48d387add..125905317 100644
--- a/components/HotelReservation/EnterDetails/SectionAccordion/sectionAccordion.module.css
+++ b/components/HotelReservation/EnterDetails/SectionAccordion/sectionAccordion.module.css
@@ -33,6 +33,10 @@
   padding: 0;
 }
 
+.modifyButton:disabled {
+  cursor: default;
+}
+
 .title {
   grid-area: title;
   text-align: start;
@@ -81,7 +85,7 @@
   grid-template-rows: var(--header-height) 1fr;
 }
 
-.accordion[data-open="true"] .content {
+.contentWrapper {
   padding-bottom: var(--Spacing-x3);
 }
 
diff --git a/components/HotelReservation/SelectRate/Rooms/utils.ts b/components/HotelReservation/SelectRate/Rooms/utils.ts
index 96d8a8488..fbd353aa1 100644
--- a/components/HotelReservation/SelectRate/Rooms/utils.ts
+++ b/components/HotelReservation/SelectRate/Rooms/utils.ts
@@ -88,7 +88,7 @@ export function filterDuplicateRoomTypesByLowestPrice(
             Math.min(
               Number(
                 previousLowest.products[0].productType.public.localPrice
-                  .pricePerNight
+                  ?.pricePerNight
               ) ?? Infinity,
               Number(
                 previousLowest.products[0].productType.member?.localPrice