diff --git a/src/components/events/EventCard/index.tsx b/src/components/events/EventCard/index.tsx
index be8b910b..d03f6805 100644
--- a/src/components/events/EventCard/index.tsx
+++ b/src/components/events/EventCard/index.tsx
@@ -74,10 +74,8 @@ const EventCard = ({
       <Link
         href={`${config.eventsRoute}/${uuid}`}
         data-community={community}
-        data-disabled={borderless ? 'true' : 'false'}
-        className={`${styles.container} ${borderless ? 'disabled' : styles.bordered} ${
-          className || ''
-        }`}
+        data-disabled={borderless}
+        className={`${styles.container} ${borderless ? '' : styles.bordered} ${className || ''}`}
         onClick={e => {
           e.preventDefault();
           setExpanded(true);
diff --git a/src/components/events/EventCard/style.module.scss b/src/components/events/EventCard/style.module.scss
index 84131ab1..d2e9962c 100644
--- a/src/components/events/EventCard/style.module.scss
+++ b/src/components/events/EventCard/style.module.scss
@@ -20,7 +20,7 @@
     border-radius: 10px;
   }
 
-  &:not([data-disabled='true']):hover {
+  &:not([data-disabled]):hover {
     outline-width: 4px;
     transform: scale(0.975);
 
diff --git a/src/pages/store/cart.tsx b/src/pages/store/cart.tsx
index ca1f1d32..fc5c694f 100644
--- a/src/pages/store/cart.tsx
+++ b/src/pages/store/cart.tsx
@@ -252,7 +252,7 @@ const getServerSidePropsFunc: GetServerSideProps = async ({ req, res }) => {
     events
       .filter(event => event.status !== 'CANCELLED')
       .filter(
-        event => (event.orders?.length ?? 0) <= (event?.orderLimit ?? Number.MAX_SAFE_INTEGER)
+        event => !(event.orders && event.orderLimit && event.orders.length > event.orderLimit)
       )
   );
   const userPromise = getCurrentUserAndRefreshCookie(AUTH_TOKEN, { req, res });