diff --git a/website_event_membership_restriction/views/event_templates.xml b/website_event_membership_restriction/views/event_templates.xml
index 0bc58117f..31d0dadf3 100644
--- a/website_event_membership_restriction/views/event_templates.xml
+++ b/website_event_membership_restriction/views/event_templates.xml
@@ -7,6 +7,7 @@
         inherit_id="website_event.registration_template"
         priority="999"
     >
+        <!-- Hide the existing element and recreate it as both class and t-att-class can't coexist -->
         <xpath
             expr="//form//div[@id='o_wevent_tickets_collapse']//button"
             position="attributes"
@@ -17,9 +18,13 @@
             expr="//form//div[@id='o_wevent_tickets_collapse']//button"
             position="after"
         >
+            <t
+                t-set="is_disabled_for_non_members"
+                t-value="event.registration_membership_only and (not request.env.user or request.env.user.partner_id.commercial_partner_id.membership_state not in ['paid', 'free'] or request.env.user.partner_id.membership_state not in ['paid', 'free'])"
+            />
             <button
                 type="submit"
-                t-att-class="'btn btn-primary o_wait_lazy_js a-submit ' + (event.registration_membership_only and (not request.env.user._is_public() and (request.env.user.partner_id.commercial_partner_id.membership_state not in ['paid', 'free'] or request.env.user.partner_id.membership_state not in ['paid', 'free']) and 'disabled' or ''))"
+                t-att-class="'btn btn-primary o_wait_lazy_js a-submit ' + ('disabled' if is_disabled_for_non_members else '')"
                 t-attf-id="#{event.id}"
             >
                 Register
@@ -29,19 +34,22 @@
                     (only <t t-out="event.seats_available" /> available)
                 </t>
             </button>
-            <t
-                t-if="event.registration_membership_only and (not request.env.user._is_public() and (request.env.user.partner_id.commercial_partner_id.membership_state not in ['paid', 'free'] or request.env.user.partner_id.membership_state not in ['paid', 'free']))"
-            >
+            <t t-if="is_disabled_for_non_members">
                 <a class="text-center small" href="/membership-info">Members only</a>
             </t>
         </xpath>
+        <!-- Hide the existing element and recreate it as both class and t-att-class can't coexist -->
         <xpath expr="//form//div[@t-else='']//button" position="attributes">
             <attribute name="class">d-none</attribute>
         </xpath>
         <xpath expr="//form//div[@t-else='']//button" position="after">
+            <t
+                t-set="is_disabled_for_non_members"
+                t-value="event.registration_membership_only and (not request.env.user or request.env.user.partner_id.commercial_partner_id.membership_state not in ['paid', 'free'] or request.env.user.partner_id.membership_state not in ['paid', 'free'])"
+            />
             <button
                 type="submit"
-                t-att-class="'btn btn-primary o_wait_lazy_js a-submit ' + (event.registration_membership_only and (not request.env.user._is_public() and (request.env.user.partner_id.commercial_partner_id.membership_state not in ['paid', 'free'] or request.env.user.partner_id.membership_state not in ['paid', 'free']) and 'disabled' or ''))"
+                t-att-class="'btn btn-primary o_wait_lazy_js a-submit ' + ('disabled' if is_disabled_for_non_members else '')"
                 t-attf-id="#{event.id}"
             >
                 Register
@@ -51,9 +59,7 @@
                     (only <t t-out="event.seats_available" /> available)
                 </t>
             </button>
-            <t
-                t-if="event.registration_membership_only and (not request.env.user._is_public() and (request.env.user.partner_id.commercial_partner_id.membership_state not in ['paid', 'free'] or request.env.user.partner_id.membership_state not in ['paid', 'free']))"
-            >
+            <t t-if="is_disabled_for_non_members">
                 <a class="text-center small" href="/membership-info">Members only</a>
             </t>
         </xpath>