diff --git a/packages/hoppscotch-app/components/teams/Edit.vue b/packages/hoppscotch-app/components/teams/Edit.vue
index d4146ff17..e4fd4032d 100644
--- a/packages/hoppscotch-app/components/teams/Edit.vue
+++ b/packages/hoppscotch-app/components/teams/Edit.vue
@@ -34,75 +34,23 @@
             />
           </div>
         </div>
-        <div class="divide-y divide-dividerLight border-divider border rounded">
+        <div
+          v-if="teamDetails.loading"
+          class="flex flex-col items-center justify-center"
+        >
+          <SmartSpinner class="mb-4" />
+          <span class="text-secondaryLight">{{ $t("state.loading") }}</span>
+        </div>
+        <div
+          v-if="
+            !teamDetails.loading &&
+            E.isRight(teamDetails.data) &&
+            teamDetails.data.right.team.teamMembers
+          "
+          class="divide-y divide-dividerLight border-divider border rounded"
+        >
           <div
-            v-for="(member, index) in members"
-            :key="`member-${index}`"
-            class="divide-x divide-dividerLight flex"
-          >
-            <input
-              class="bg-transparent flex flex-1 py-2 px-4"
-              :placeholder="$t('team.email')"
-              :name="'param' + index"
-              :value="member.user.email"
-              readonly
-            />
-            <span>
-              <tippy
-                :ref="`memberOptions-${index}`"
-                interactive
-                trigger="click"
-                theme="popover"
-                arrow
-              >
-                <template #trigger>
-                  <span class="select-wrapper">
-                    <input
-                      class="
-                        bg-transparent
-                        cursor-pointer
-                        flex flex-1
-                        py-2
-                        px-4
-                      "
-                      :placeholder="$t('team.permissions')"
-                      :name="'value' + index"
-                      :value="
-                        typeof member.role === 'string'
-                          ? member.role
-                          : JSON.stringify(member.role)
-                      "
-                      readonly
-                    />
-                  </span>
-                </template>
-                <SmartItem
-                  label="OWNER"
-                  @click.native="updateMemberRole(index, 'OWNER')"
-                />
-                <SmartItem
-                  label="EDITOR"
-                  @click.native="updateMemberRole(index, 'EDITOR')"
-                />
-                <SmartItem
-                  label="VIEWER"
-                  @click.native="updateMemberRole(index, 'VIEWER')"
-                />
-              </tippy>
-            </span>
-            <div class="flex">
-              <ButtonSecondary
-                id="member"
-                v-tippy="{ theme: 'tooltip' }"
-                :title="$t('action.remove')"
-                svg="trash"
-                color="red"
-                @click.native="removeExistingTeamMember(member.user.uid)"
-              />
-            </div>
-          </div>
-          <div
-            v-if="members.length === 0"
+            v-if="teamDetails.data.right.team.teamMembers === 0"
             class="
               flex flex-col
               text-secondaryLight
@@ -125,6 +73,81 @@
               "
             />
           </div>
+          <div v-else>
+            <div
+              v-for="(member, index) in teamDetails.data.right.team.teamMembers"
+              :key="`member-${index}`"
+              class="divide-x divide-dividerLight flex"
+            >
+              <input
+                class="bg-transparent flex flex-1 py-2 px-4"
+                :placeholder="$t('team.email')"
+                :name="'param' + index"
+                :value="member.user.email"
+                readonly
+              />
+              <span>
+                <tippy
+                  :ref="`memberOptions-${index}`"
+                  interactive
+                  trigger="click"
+                  theme="popover"
+                  arrow
+                >
+                  <template #trigger>
+                    <span class="select-wrapper">
+                      <input
+                        class="
+                          bg-transparent
+                          cursor-pointer
+                          flex flex-1
+                          py-2
+                          px-4
+                        "
+                        :placeholder="$t('team.permissions')"
+                        :name="'value' + index"
+                        :value="
+                          typeof member.role === 'string'
+                            ? member.role
+                            : JSON.stringify(member.role)
+                        "
+                        readonly
+                      />
+                    </span>
+                  </template>
+                  <SmartItem
+                    label="OWNER"
+                    @click.native="updateMemberRole(index, 'OWNER')"
+                  />
+                  <SmartItem
+                    label="EDITOR"
+                    @click.native="updateMemberRole(index, 'EDITOR')"
+                  />
+                  <SmartItem
+                    label="VIEWER"
+                    @click.native="updateMemberRole(index, 'VIEWER')"
+                  />
+                </tippy>
+              </span>
+              <div class="flex">
+                <ButtonSecondary
+                  id="member"
+                  v-tippy="{ theme: 'tooltip' }"
+                  :title="$t('action.remove')"
+                  svg="trash"
+                  color="red"
+                  @click.native="removeExistingTeamMember(member.user.uid)"
+                />
+              </div>
+            </div>
+          </div>
+        </div>
+        <div
+          v-if="!teamDetails.loading && E.isLeft(teamDetails.data)"
+          class="flex flex-col items-center"
+        >
+          <i class="mb-4 material-icons">help_outline</i>
+          {{ $t("error.something_went_wrong") }}
         </div>
       </div>
     </template>
@@ -140,138 +163,174 @@
   </SmartModal>
 </template>
 
-<script>
-import cloneDeep from "lodash/cloneDeep"
-import { defineComponent } from "@nuxtjs/composition-api"
-import * as teamUtils from "~/helpers/teams/utils"
-import TeamMemberAdapter from "~/helpers/teams/TeamMemberAdapter"
+<script setup lang="ts">
+import {
+  computed,
+  ref,
+  toRef,
+  useContext,
+  watch,
+} from "@nuxtjs/composition-api"
+import * as E from "fp-ts/Either"
+import { TeamsTeamMember } from "~/helpers/teams/TeamMemberAdapter"
+import {
+  GetTeamDocument,
+  GetTeamQuery,
+  GetTeamQueryVariables,
+  TeamMemberAddedDocument,
+  TeamMemberRemovedDocument,
+  TeamMemberRole,
+  TeamMemberUpdatedDocument,
+} from "~/helpers/backend/graphql"
+import {
+  removeTeamMember,
+  renameTeam,
+  updateTeamMemberRole,
+} from "~/helpers/backend/mutations/Team"
+import { TeamNameCodec } from "~/helpers/backend/types/TeamName"
+import { useGQLQuery } from "~/helpers/backend/GQLClient"
 
-export default defineComponent({
-  props: {
-    show: Boolean,
-    editingTeam: { type: Object, default: () => {} },
-    editingteamID: { type: String, default: null },
+const emit = defineEmits<{
+  (e: "hide-modal"): void
+}>()
+
+const props = defineProps<{
+  show: boolean
+  editingTeam: {
+    name: string
+  }
+  editingTeamID: string
+}>()
+
+const {
+  $toast,
+  app: { i18n },
+} = useContext()
+const t = i18n.t.bind(i18n)
+
+const members = ref<TeamsTeamMember[]>([])
+
+const name = toRef(props.editingTeam, "name")
+
+watch(
+  () => props.editingTeam.name,
+  (newName: string) => {
+    name.value = newName
+  }
+)
+
+watch(
+  () => props.editingTeamID,
+  (teamID: string) => {
+    teamDetails.execute({ teamID })
+  }
+)
+
+const teamDetails = useGQLQuery<GetTeamQuery, GetTeamQueryVariables, "">({
+  query: GetTeamDocument,
+  variables: {
+    teamID: props.editingTeamID,
   },
-  data() {
-    return {
-      rename: null,
-      members: [],
-      membersAdapter: new TeamMemberAdapter(null),
-    }
-  },
-  computed: {
-    editingTeamCopy() {
-      return this.editingTeam
-    },
-    name: {
-      get() {
-        return this.editingTeam.name
-      },
-      set(name) {
-        this.rename = name
-      },
-    },
-  },
-  watch: {
-    editingteamID(teamID) {
-      this.membersAdapter.changeTeamID(teamID)
-    },
-  },
-  mounted() {
-    this.membersAdapter.members$.subscribe((list) => {
-      this.members = cloneDeep(list)
+  defer: true,
+  updateSubs: computed(() => {
+    if (props.editingTeamID) {
+      return [
+        {
+          key: 1,
+          query: TeamMemberAddedDocument,
+          variables: {
+            teamID: props.editingTeamID,
+          },
+        },
+        {
+          key: 2,
+          query: TeamMemberUpdatedDocument,
+          variables: {
+            teamID: props.editingTeamID,
+          },
+        },
+        {
+          key: 3,
+          query: TeamMemberRemovedDocument,
+          variables: {
+            teamID: props.editingTeamID,
+          },
+        },
+      ]
+    } else return []
+  }),
+})
+
+const updateMemberRole = (id: number, role: TeamMemberRole) => {
+  members.value[id].role = role
+  // $refs[`memberOptions-${id}`][0].tippy().hide()
+}
+
+const removeExistingTeamMember = async (userID: string) => {
+  const removeTeamMemberResult = await removeTeamMember(
+    userID,
+    props.editingTeamID
+  )()
+  if (E.isLeft(removeTeamMemberResult)) {
+    $toast.error(t("error.something_went_wrong"), {
+      icon: "error",
     })
-  },
-  methods: {
-    updateMemberRole(id, role) {
-      this.members[id].role = role
-      this.$refs[`memberOptions-${id}`][0].tippy().hide()
-    },
-    removeExistingTeamMember(userID) {
-      teamUtils
-        .removeTeamMember(this.$apollo, userID, this.editingteamID)
-        .then(() => {
-          this.$toast.success(this.$t("team.member_removed"), {
-            icon: "done",
-          })
-          this.hideModal()
+  } else {
+    $toast.success(t("team.member_removed"), {
+      icon: "done",
+    })
+  }
+}
+
+const saveTeam = async () => {
+  if (name.value !== "") {
+    if (TeamNameCodec.is(name.value)) {
+      const updateTeamNameResult = await renameTeam(
+        props.editingTeamID,
+        name.value
+      )()
+      if (E.isLeft(updateTeamNameResult)) {
+        $toast.error(t("error.something_went_wrong"), {
+          icon: "error",
         })
-        .catch((e) => {
-          this.$toast.error(this.$t("error.something_went_wrong"), {
-            icon: "error_outline",
-          })
-          console.error(e)
+      } else {
+        $toast.success(t("team.name_updated"), {
+          icon: "done",
         })
-    },
-    validateEmail(emailID) {
-      if (
-        /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/.test(
-          emailID
-        )
-      ) {
-        return true
-      }
-      return false
-    },
-    saveTeam() {
-      if (
-        this.$data.rename !== null &&
-        this.$data.rename.replace(/\s/g, "").length < 6
-      ) {
-        this.$toast.error(this.$t("team.name_length_insufficient"), {
-          icon: "error_outline",
-        })
-        return
-      }
-      this.members.forEach((element) => {
-        teamUtils
-          .updateTeamMemberRole(
-            this.$apollo,
-            element.user.uid,
-            element.role,
-            this.editingteamID
-          )
-          .then(() => {
-            this.$toast.success(this.$t("team.member_role_updated"), {
-              icon: "done",
-            })
-          })
-          .catch((e) => {
-            this.$toast.error(e, {
-              icon: "error_outline",
-            })
-            console.error(e)
-          })
-      })
-      if (this.$data.rename !== null) {
-        const newName =
-          this.name === this.$data.rename ? this.name : this.$data.rename
-        if (!/\S/.test(newName))
-          return this.$toast.error(this.$t("empty.team_name"), {
-            icon: "error_outline",
-          })
-        // Call to the graphql mutation
-        if (this.name !== this.rename)
-          teamUtils
-            .renameTeam(this.$apollo, newName, this.editingteamID)
-            .then(() => {
-              this.$toast.success(this.$t("team.saved"), {
+        members.value.forEach(
+          async (element: { user: { uid: any }; role: any }) => {
+            const updateMemberRoleResult = await updateTeamMemberRole(
+              element.user.uid,
+              props.editingTeamID,
+              element.role
+            )()
+            if (E.isLeft(updateMemberRoleResult)) {
+              $toast.error(t("error.something_went_wrong"), {
+                icon: "error",
+              })
+              console.error(updateMemberRoleResult.left.error)
+            } else {
+              $toast.success(t("team.member_role_updated"), {
                 icon: "done",
               })
-            })
-            .catch((e) => {
-              this.$toast.error(this.$t("error.something_went_wrong"), {
-                icon: "error_outline",
-              })
-              console.error(e)
-            })
+            }
+          }
+        )
       }
-      this.hideModal()
-    },
-    hideModal() {
-      this.rename = null
-      this.$emit("hide-modal")
-    },
-  },
-})
+      hideModal()
+    } else {
+      return $toast.error(t("team.name_length_insufficient"), {
+        icon: "error_outline",
+      })
+    }
+  } else {
+    return $toast.error(t("empty.team_name"), {
+      icon: "error_outline",
+    })
+  }
+}
+
+const hideModal = () => {
+  emit("hide-modal")
+}
 </script>
diff --git a/packages/hoppscotch-app/components/teams/Invite.vue b/packages/hoppscotch-app/components/teams/Invite.vue
index 68f3f5a78..0354c67e3 100644
--- a/packages/hoppscotch-app/components/teams/Invite.vue
+++ b/packages/hoppscotch-app/components/teams/Invite.vue
@@ -326,7 +326,7 @@ const newInviteeOptions = ref<any | null>(null)
 
 const props = defineProps({
   show: Boolean,
-  editingteamID: { type: String, default: null },
+  editingTeamID: { type: String, default: null },
 })
 
 const emit = defineEmits<{
@@ -340,17 +340,17 @@ const pendingInvites = useGQLQuery<
 >({
   query: GetPendingInvitesDocument,
   variables: reactive({
-    teamID: props.editingteamID,
+    teamID: props.editingTeamID,
   }),
   defer: true,
 })
 
 watch(
-  () => props.editingteamID,
+  () => props.editingTeamID,
   () => {
-    if (props.editingteamID) {
+    if (props.editingTeamID) {
       pendingInvites.execute({
-        teamID: props.editingteamID,
+        teamID: props.editingTeamID,
       })
     }
   }
@@ -420,7 +420,7 @@ const sendInvites = async () => {
     ),
     O.map(
       A.map((invitee) =>
-        createTeamInvitation(invitee.key, invitee.value, props.editingteamID)
+        createTeamInvitation(invitee.key, invitee.value, props.editingTeamID)
       )
     )
   )
diff --git a/packages/hoppscotch-app/components/teams/index.vue b/packages/hoppscotch-app/components/teams/index.vue
index 3cc17d78b..3fb8bfcfd 100644
--- a/packages/hoppscotch-app/components/teams/index.vue
+++ b/packages/hoppscotch-app/components/teams/index.vue
@@ -66,7 +66,7 @@
       :team="myTeams.data.right.myTeams[0]"
       :show="showModalEdit"
       :editing-team="editingTeam"
-      :editingteam-i-d="editingTeamID"
+      :editing-team-i-d="editingTeamID"
       @hide-modal="displayModalEdit(false)"
       @invite-team="inviteTeam(editingTeam, editingTeamID)"
     />
@@ -79,7 +79,7 @@
       :team="myTeams.data.right.myTeams[0]"
       :show="showModalInvite"
       :editing-team="editingTeam"
-      :editingteam-i-d="editingTeamID"
+      :editing-team-i-d="editingTeamID"
       @hide-modal="displayModalInvite(false)"
     />
   </AppSection>
@@ -124,8 +124,6 @@ const displayModalAdd = (shouldDisplay: boolean) => {
 
 const displayModalEdit = (shouldDisplay: boolean) => {
   showModalEdit.value = shouldDisplay
-
-  if (!shouldDisplay) resetSelectedData()
 }
 
 const displayModalInvite = (shouldDisplay: boolean) => {
@@ -143,9 +141,4 @@ const inviteTeam = (team: any, teamID: any) => {
   editingTeamID.value = teamID
   displayModalInvite(true)
 }
-
-const resetSelectedData = () => {
-  editingTeam.value = undefined
-  editingTeamID.value = undefined
-}
 </script>
diff --git a/packages/hoppscotch-app/helpers/backend/gql/queries/GetTeam.graphql b/packages/hoppscotch-app/helpers/backend/gql/queries/GetTeam.graphql
index 4a45ec07c..852c6cd22 100644
--- a/packages/hoppscotch-app/helpers/backend/gql/queries/GetTeam.graphql
+++ b/packages/hoppscotch-app/helpers/backend/gql/queries/GetTeam.graphql
@@ -6,8 +6,9 @@ query GetTeam($teamID: ID!) {
       membershipID
       user {
         uid
+        email
       }
       role
     }
   }
-}
\ No newline at end of file
+}
diff --git a/packages/hoppscotch-app/helpers/backend/gql/subscriptions/TeamMemberAdded.graphql b/packages/hoppscotch-app/helpers/backend/gql/subscriptions/TeamMemberAdded.graphql
new file mode 100644
index 000000000..dd15795e0
--- /dev/null
+++ b/packages/hoppscotch-app/helpers/backend/gql/subscriptions/TeamMemberAdded.graphql
@@ -0,0 +1,5 @@
+subscription TeamMemberAdded($teamID: ID!) {
+  teamMemberAdded(teamID: $teamID) {
+    membershipID
+  }
+}
diff --git a/packages/hoppscotch-app/helpers/backend/gql/subscriptions/TeamMemberRemoved.graphql b/packages/hoppscotch-app/helpers/backend/gql/subscriptions/TeamMemberRemoved.graphql
new file mode 100644
index 000000000..36ecb406f
--- /dev/null
+++ b/packages/hoppscotch-app/helpers/backend/gql/subscriptions/TeamMemberRemoved.graphql
@@ -0,0 +1,3 @@
+subscription TeamMemberRemoved($teamID: ID!) {
+  teamMemberRemoved(teamID: $teamID)
+}
diff --git a/packages/hoppscotch-app/helpers/backend/gql/subscriptions/TeamMemberUpdated.graphql b/packages/hoppscotch-app/helpers/backend/gql/subscriptions/TeamMemberUpdated.graphql
new file mode 100644
index 000000000..bed609224
--- /dev/null
+++ b/packages/hoppscotch-app/helpers/backend/gql/subscriptions/TeamMemberUpdated.graphql
@@ -0,0 +1,5 @@
+subscription TeamMemberUpdated($teamID: ID!) {
+  teamMemberUpdated(teamID: $teamID) {
+    membershipID
+  }
+}
diff --git a/packages/hoppscotch-app/helpers/teams/TeamMemberAdapter.ts b/packages/hoppscotch-app/helpers/teams/TeamMemberAdapter.ts
index 77ca87230..ec35118b7 100644
--- a/packages/hoppscotch-app/helpers/teams/TeamMemberAdapter.ts
+++ b/packages/hoppscotch-app/helpers/teams/TeamMemberAdapter.ts
@@ -4,7 +4,7 @@ import cloneDeep from "lodash/cloneDeep"
 import * as Apollo from "@apollo/client/core"
 import { apolloClient } from "~/helpers/apollo"
 
-interface TeamsTeamMember {
+export interface TeamsTeamMember {
   membershipID: string
   user: {
     uid: string
diff --git a/packages/hoppscotch-app/locales/en.json b/packages/hoppscotch-app/locales/en.json
index 45432d870..478c17499 100644
--- a/packages/hoppscotch-app/locales/en.json
+++ b/packages/hoppscotch-app/locales/en.json
@@ -485,7 +485,6 @@
     "invalid_invite_link_description": "The link you followed is invalid. Contact your team owner.",
     "invalid_member_permission": "Please provide a valid permission to the team member",
     "invite": "Invite",
-    "logout_and_try_again": "Logout and sign in with another account",
     "invite_more": "Invite more",
     "invite_tooltip": "Invite people to this workspace",
     "invited_to_team": "{owner} invited you to join {team}",
@@ -497,12 +496,14 @@
     "left": "You left the team",
     "login_to_continue": "Login to continue",
     "login_to_continue_description": "You need to be logged in to join a team.",
+    "logout_and_try_again": "Logout and sign in with another account",
     "member_has_invite": "This email ID already has an invite. Contact your team owner.",
     "member_not_found": "Member not found. Contact your team owner.",
     "member_removed": "User removed",
     "member_role_updated": "User roles updated",
     "members": "Members",
     "name_length_insufficient": "Team name should be atleast 6 characters long",
+    "name_updated": "Team name updated",
     "new": "New Team",
     "new_created": "New team created",
     "new_name": "My New Team",