diff --git a/src/pages/(admin)/Lists/UserList.tsx b/src/pages/(admin)/Lists/UserList.tsx
index 7749631d..dd351f1c 100644
--- a/src/pages/(admin)/Lists/UserList.tsx
+++ b/src/pages/(admin)/Lists/UserList.tsx
@@ -787,144 +787,156 @@ export default function UserList({
     document.body.removeChild(element);
   };
 
-  return (
-	<>
-	{renderHeader && renderHeader(displayUsers.length)}
-    <div className="w-full">
-      <Modal isOpen={!!selectedUser} onClose={() => setSelectedUser(undefined)}>
-        <>
-          {selectedUser && (
-            <div className="w-full flex flex-col gap-8">
-              <UserCard
-                loggedInUser={user}
-                onViewStudents={
-                  selectedUser.type === "corporate" ||
-                  selectedUser.type === "teacher"
-                    ? () => {
-                        appendUserFilters({
-                          id: "view-students",
-                          filter: (x: User) => x.type === "student",
-                        });
-                        appendUserFilters({
-                          id: "belongs-to-admin",
-                          filter: (x: User) =>
-                            groups
-                              .filter(
-                                (g) =>
-                                  g.admin === selectedUser.id ||
-                                  g.participants.includes(selectedUser.id)
-                              )
-                              .flatMap((g) => g.participants)
-                              .includes(x.id),
-                        });
+  const viewStudentFilter = (x: User) => x.type === "student";
+  const viewTeacherFilter = (x: User) => x.type === "teacher";
+  const belongsToAdminFilter = (x: User) => {
+    if (!selectedUser) return false;
+    return groups
+      .filter(
+        (g) =>
+          g.admin === selectedUser.id ||
+          g.participants.includes(selectedUser.id)
+      )
+      .flatMap((g) => g.participants)
+      .includes(x.id);
+  };
 
-                        router.push("/list/users");
-                      }
-                    : undefined
-                }
-                onViewTeachers={
-                  selectedUser.type === "corporate" ||
-                  selectedUser.type === "student"
-                    ? () => {
-                        appendUserFilters({
-                          id: "view-teachers",
-                          filter: (x: User) => x.type === "teacher",
-                        });
-                        appendUserFilters({
-                          id: "belongs-to-admin",
-                          filter: (x: User) =>
-                            groups
-                              .filter(
-                                (g) =>
-                                  g.admin === selectedUser.id ||
-                                  g.participants.includes(selectedUser.id)
-                              )
-                              .flatMap((g) => g.participants)
-                              .includes(x.id),
-                        });
+  const viewStudentFilterBelongsToAdmin = (x: User) =>
+    x.type === "student" && belongsToAdminFilter(x);
+  const viewTeacherFilterBelongsToAdmin = (x: User) =>
+    x.type === "teacher" && belongsToAdminFilter(x);
 
-                        router.push("/list/users");
-                      }
-                    : undefined
-                }
-                onViewCorporate={
-                  selectedUser.type === "teacher" ||
-                  selectedUser.type === "student"
-                    ? () => {
-                        appendUserFilters({
-                          id: "view-corporate",
-                          filter: (x: User) => x.type === "corporate",
-                        });
-                        appendUserFilters({
-                          id: "belongs-to-admin",
-                          filter: (x: User) =>
-                            groups
-                              .filter((g) =>
-                                g.participants.includes(selectedUser.id)
-                              )
-                              .flatMap((g) => [g.admin, ...g.participants])
-                              .includes(x.id),
-                        });
+  const renderUserCard = (selectedUser: User) => {
+    const studentsFromAdmin = users.filter(viewStudentFilterBelongsToAdmin);
+    const teachersFromAdmin = users.filter(viewTeacherFilterBelongsToAdmin);
+    return (
+      <div className="w-full flex flex-col gap-8">
+        <UserCard
+          loggedInUser={user}
+          onViewStudents={
+            (selectedUser.type === "corporate" ||
+              selectedUser.type === "teacher") &&
+            studentsFromAdmin.length > 0
+              ? () => {
+                  appendUserFilters({
+                    id: "view-students",
+                    filter: viewStudentFilter,
+                  });
+                  appendUserFilters({
+                    id: "belongs-to-admin",
+                    filter: belongsToAdminFilter,
+                  });
 
-                        router.push("/list/users");
-                      }
-                    : undefined
+                  router.push("/list/users");
                 }
-                onClose={(shouldReload) => {
-                  setSelectedUser(undefined);
-                  if (shouldReload) reload();
-                }}
-                user={selectedUser}
-              />
-            </div>
-          )}
-        </>
-      </Modal>
-      <div className="w-full flex flex-col gap-2">
-        <div className="w-full flex gap-2 items-end">
-          {renderSearch()}
-          <Button
-            className="w-full max-w-[200px] mb-1"
-            variant="outline"
-            onClick={downloadExcel}
-          >
-            Download List
-          </Button>
-        </div>
-        <table className="rounded-xl bg-mti-purple-ultralight/40 w-full">
-          <thead>
-            {table.getHeaderGroups().map((headerGroup) => (
-              <tr key={headerGroup.id}>
-                {headerGroup.headers.map((header) => (
-                  <th className="py-4 px-4 text-left" key={header.id}>
-                    {header.isPlaceholder
-                      ? null
-                      : flexRender(
-                          header.column.columnDef.header,
-                          header.getContext()
-                        )}
-                  </th>
-                ))}
-              </tr>
-            ))}
-          </thead>
-          <tbody className="px-2">
-            {table.getRowModel().rows.map((row) => (
-              <tr
-                className="odd:bg-white even:bg-mti-purple-ultralight/40 rounded-lg py-2"
-                key={row.id}
-              >
-                {row.getVisibleCells().map((cell) => (
-                  <td className="px-4 py-2 items-center w-fit" key={cell.id}>
-                    {flexRender(cell.column.columnDef.cell, cell.getContext())}
-                  </td>
-                ))}
-              </tr>
-            ))}
-          </tbody>
-        </table>
+              : undefined
+          }
+          onViewTeachers={
+            (selectedUser.type === "corporate" ||
+              selectedUser.type === "student") &&
+            teachersFromAdmin.length > 0
+              ? () => {
+                  appendUserFilters({
+                    id: "view-teachers",
+                    filter: viewTeacherFilter,
+                  });
+                  appendUserFilters({
+                    id: "belongs-to-admin",
+                    filter: belongsToAdminFilter,
+                  });
+
+                  router.push("/list/users");
+                }
+              : undefined
+          }
+          onViewCorporate={
+            selectedUser.type === "teacher" || selectedUser.type === "student"
+              ? () => {
+                  appendUserFilters({
+                    id: "view-corporate",
+                    filter: (x: User) => x.type === "corporate",
+                  });
+                  appendUserFilters({
+                    id: "belongs-to-admin",
+                    filter: (x: User) =>
+                      groups
+                        .filter((g) => g.participants.includes(selectedUser.id))
+                        .flatMap((g) => [g.admin, ...g.participants])
+                        .includes(x.id),
+                  });
+
+                  router.push("/list/users");
+                }
+              : undefined
+          }
+          onClose={(shouldReload) => {
+            setSelectedUser(undefined);
+            if (shouldReload) reload();
+          }}
+          user={selectedUser}
+        />
       </div>
-    </div>
-	</>
+    );
+  };
+
+  return (
+    <>
+      {renderHeader && renderHeader(displayUsers.length)}
+      <div className="w-full">
+        <Modal
+          isOpen={!!selectedUser}
+          onClose={() => setSelectedUser(undefined)}
+        >
+          {selectedUser && renderUserCard(selectedUser)}
+        </Modal>
+        <div className="w-full flex flex-col gap-2">
+          <div className="w-full flex gap-2 items-end">
+            {renderSearch()}
+            <Button
+              className="w-full max-w-[200px] mb-1"
+              variant="outline"
+              onClick={downloadExcel}
+            >
+              Download List
+            </Button>
+          </div>
+          <table className="rounded-xl bg-mti-purple-ultralight/40 w-full">
+            <thead>
+              {table.getHeaderGroups().map((headerGroup) => (
+                <tr key={headerGroup.id}>
+                  {headerGroup.headers.map((header) => (
+                    <th className="py-4 px-4 text-left" key={header.id}>
+                      {header.isPlaceholder
+                        ? null
+                        : flexRender(
+                            header.column.columnDef.header,
+                            header.getContext()
+                          )}
+                    </th>
+                  ))}
+                </tr>
+              ))}
+            </thead>
+            <tbody className="px-2">
+              {table.getRowModel().rows.map((row) => (
+                <tr
+                  className="odd:bg-white even:bg-mti-purple-ultralight/40 rounded-lg py-2"
+                  key={row.id}
+                >
+                  {row.getVisibleCells().map((cell) => (
+                    <td className="px-4 py-2 items-center w-fit" key={cell.id}>
+                      {flexRender(
+                        cell.column.columnDef.cell,
+                        cell.getContext()
+                      )}
+                    </td>
+                  ))}
+                </tr>
+              ))}
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </>
   );
 }