diff --git a/src/components/CommonKit/Modal/Modal.tsx b/src/components/CommonKit/Modal/Modal.tsx
index 8a8fa49da4ac2e5d5f30897ef9cbb3313f9ba1e2..444ea3a70d9e2df1abce76bc117aaef1139e9f1a 100644
--- a/src/components/CommonKit/Modal/Modal.tsx
+++ b/src/components/CommonKit/Modal/Modal.tsx
@@ -17,12 +17,11 @@ const Modal: React.FC<ModalProps> = ({
   children,
   yellowBorder,
 }: ModalProps) => {
+  const yellow = yellowBorder ? yellowBorder : ''
   return (
     <div className={`modal-overlay ${open ? 'modal-opened' : ''}`}>
       <div
-        className={`modal-box ${
-          border ? 'modal-box-bordered' : ''
-        }${yellowBorder}`}
+        className={`modal-box ${border ? 'modal-box-bordered' : ''} ${yellow}`}
       >
         <StyledIconButton
           className="modal-close-button"
diff --git a/src/components/ContentComponents/EcogestureList/EcogestureList.tsx b/src/components/ContentComponents/EcogestureList/EcogestureList.tsx
index fc4d498289696fa1bca6437114c553936d485c25..f81a02ff2f55d6c8e97ea6b993b5595e09b5acd4 100644
--- a/src/components/ContentComponents/EcogestureList/EcogestureList.tsx
+++ b/src/components/ContentComponents/EcogestureList/EcogestureList.tsx
@@ -106,13 +106,6 @@ const EcogesturesList: React.FC<EcogesturesListProps> = ({
         opened={openEcogestureModal}
         ecogesture={selectedEcogesture}
         handleCloseClick={handleCloseClick}
-        border={
-          selectedEcogesture
-            ? selectedEcogesture.unlocked
-              ? selectedEcogesture.unlocked
-              : false
-            : false
-        }
       />
     </div>
   )