diff --git a/app/components/join-section.hbs b/app/components/join-section.hbs
index 8d46beb9..980fc985 100644
--- a/app/components/join-section.hbs
+++ b/app/components/join-section.hbs
@@ -1,32 +1,38 @@
 {{#if this.isDevMode}}
-<section data-test-join class='join'>
-  <h3 data-test-join-title class='join__title'>How to Join</h3>
-  <h2 data-test-join-title-highlighted class='join__title-highlighted'>Real Dev
-    Squad</h2>
-  <p data-test-para='1' class='join__para'>Our squad focuses on quality and we
-    want to work with people who are willing to be serious about their growth in
-    the squad.
-  </p>
-  <p data-test-para='2' class='join__para'>It's okay if you don't know much yet,
-    but it won't be okay to not put in any efforts for yourself. We want to
-    value everyone's time and efforts.
-  </p>
-  <LinkTo data-test-join-link @route='join' class='join__link'>Join the Squad</LinkTo>
-</section>
+  <section data-test-join class='join'>
+    <h3 data-test-join-title class='join__title'>How to Join</h3>
+    <h2 data-test-join-title-highlighted class='join__title-highlighted'>Real
+      Dev Squad</h2>
+    <p data-test-para='1' class='join__para'>Our squad focuses on quality and we
+      want to work with people who are willing to be serious about their growth
+      in the squad.
+    </p>
+    <p data-test-para='2' class='join__para'>It's okay if you don't know much
+      yet, but it won't be okay to not put in any efforts for yourself. We want
+      to value everyone's time and efforts.
+    </p>
+    <LinkTo data-test-join-link @route='join' class='join__link'>Join the Squad</LinkTo>
+  </section>
 {{else}}
-<section data-test-join class='join'>
-  <h3 data-test-join-title class='join__title join__title--new'>How can you join?</h3>
+  <section data-test-join class='join'>
+    <h3 data-test-join-title class='join__title join__title--new'>How can you
+      join?</h3>
 
-  <p data-test-para='first' class='join__para join__para--new'>Our squad focuses on quality and we
-    want to work with people who are willing to be serious about their growth in
-    the squad.It's okay if you don't know much yet,
-    but it won't be okay to not put in any efforts for yourself. We want to
-    value everyone's time and efforts.
-  </p>
+    <p data-test-para='first' class='join__para join__para--new'>Our squad
+      focuses on quality and we want to work with people who are willing to be
+      serious about their growth in the squad.It's okay if you don't know much
+      yet, but it won't be okay to not put in any efforts for yourself. We want
+      to value everyone's time and efforts.
+    </p>
 
-  <LinkTo data-test-join-link @route='join' class='join__link join__link--new' @disabled={{true}}>Join the Squad</LinkTo>
+    <LinkTo
+      data-test-join-link
+      {{! @todo add join link route when join flow gets opened }}
+      @route='index'
+      class='join__link join__link--new'
+      @disabled={{true}}
+    >Join the Squad</LinkTo>
     <p data-test-join-later-text class='join__later-text'>
-We're currently not accepting new applications. Please check back in
-2024.</p>
-</section>
+      We're currently not accepting new applications. Please check back in 2024.</p>
+  </section>
 {{/if}}
\ No newline at end of file
diff --git a/app/components/stepper.js b/app/components/stepper.js
index e554b120..98250e6f 100644
--- a/app/components/stepper.js
+++ b/app/components/stepper.js
@@ -65,40 +65,50 @@ export default class StepperComponent extends Component {
   }
 
   @action async joinHandler() {
-    const firstName = localStorage.getItem('first_name');
-    const lastName = localStorage.getItem('last_name');
-    const data = JSON.stringify({
-      firstName,
-      lastName,
-      ...this.stepOneData,
-      ...this.stepTwoData,
-      ...this.stepThreeData,
-    });
-    try {
-      const response = await fetch(this.JOIN_URL, {
-        method: 'PUT',
-        headers: { 'Content-Type': 'application/json' },
-        credentials: 'include',
-        body: data,
-      });
+    /* @todo-1 remove this toast and return statement when join flow gets opened*/
+    return this.toast.info(
+      "Currently we're not taking applications please keep an eye on our website for openings",
+      'Hey there👋',
+      TOAST_OPTIONS,
+    );
+    /* @todo-1 ends here*/
 
-      if (response.status === 201) {
-        this.toast.success(
-          'Successfully submitted the form',
-          'Success!',
-          TOAST_OPTIONS,
-        );
-        this.incrementStep();
-      } else if (response.status === 409) {
-        this.toast.error(
-          'You have already filled the form',
-          'User Exist!',
-          TOAST_OPTIONS,
-        );
-      }
-    } catch (err) {
-      this.toast.error('Some error occured', 'Error ocurred!', TOAST_OPTIONS);
-      console.log('Error: ', err);
-    }
+    /* @todo-2 uncomment this part when join flow gets opened  */
+    // const firstName = localStorage.getItem('first_name');
+    // const lastName = localStorage.getItem('last_name');
+    // const data = JSON.stringify({
+    //   firstName,
+    //   lastName,
+    //   ...this.stepOneData,
+    //   ...this.stepTwoData,
+    //   ...this.stepThreeData,
+    // });
+    // try {
+    //   const response = await fetch(this.JOIN_URL, {
+    //     method: 'PUT',
+    //     headers: { 'Content-Type': 'application/json' },
+    //     credentials: 'include',
+    //     body: data,
+    //   });
+
+    //   if (response.status === 201) {
+    //     this.toast.success(
+    //       'Successfully submitted the form',
+    //       'Success!',
+    //       TOAST_OPTIONS,
+    //     );
+    //     this.incrementStep();
+    //   } else if (response.status === 409) {
+    //     this.toast.error(
+    //       'You have already filled the form',
+    //       'User Exist!',
+    //       TOAST_OPTIONS,
+    //     );
+    //   }
+    // } catch (err) {
+    //   this.toast.error('Some error occured', 'Error ocurred!', TOAST_OPTIONS);
+    //   console.log('Error: ', err);
+    // }
+    /*@todo-2 ends here */
   }
 }