diff --git a/src/Pages/TeamRevamp/index.tsx b/src/Pages/TeamRevamp/index.tsx
index 690f3aa..4c9678a 100644
--- a/src/Pages/TeamRevamp/index.tsx
+++ b/src/Pages/TeamRevamp/index.tsx
@@ -33,7 +33,7 @@ const TeamRevamp: FC = () => {
   }, []);
 
   useEffect(() => {
-    if (selectedTeam) {
+    if (selectedTeam && selectedTeamId) {
       dispatch(fetchTeamDetails(selectedTeamId.toString()));
     }
   }, [selectedTeam]);
diff --git a/src/Pages/TeamRevamp/partials/TeamMemberDetails/index.tsx b/src/Pages/TeamRevamp/partials/TeamMemberDetails/index.tsx
index 7cee0c6..51000a9 100644
--- a/src/Pages/TeamRevamp/partials/TeamMemberDetails/index.tsx
+++ b/src/Pages/TeamRevamp/partials/TeamMemberDetails/index.tsx
@@ -57,7 +57,7 @@ const TeamMemberDetails: React.FC = () => {
     });
   };
 
-  const handleOpenModal = (member: MemberType) => () => {
+  const handleOpenModal = (member: MemberType): void => {
     dispatchData({
       type: actionTypes.SET_SELECTED_MEMBER,
       payload: member,
@@ -73,7 +73,7 @@ const TeamMemberDetails: React.FC = () => {
       payload: false,
     });
   };
-  const handleOpenDialog = (member: MemberType) => () => {
+  const handleOpenDialog = (member: MemberType): void => {
     dispatchData({
       type: actionTypes.SET_SELECTED_MEMBER,
       payload: member,
@@ -170,7 +170,12 @@ const TeamMemberDetails: React.FC = () => {
                   </Typography>{' '}
                   <div className={styles['make-manger-button']}>
                     {manager?.name !== item.name && (
-                      <Button variant="text" onClick={handleOpenModal(item)}>
+                      <Button
+                        variant="text"
+                        onClick={() => {
+                          handleOpenModal(item);
+                        }}
+                      >
                         Make a manager{' '}
                       </Button>
                     )}
@@ -179,7 +184,9 @@ const TeamMemberDetails: React.FC = () => {
                 {manager?.name !== item.name && (
                   <div
                     id={item.id}
-                    onClick={handleOpenDialog(item)}
+                    onClick={() => {
+                      handleOpenDialog(item);
+                    }}
                     className={styles['delete-icon']}
                   >
                     <DeleteIcon />