diff --git a/app/segments/(team)/blacklist.js b/app/segments/(team)/blacklist.js
index da070ac9..478e1d58 100644
--- a/app/segments/(team)/blacklist.js
+++ b/app/segments/(team)/blacklist.js
@@ -5,6 +5,7 @@ import { Button, List } from "react-native-paper";
 import { themeColors } from "~/Constants";
 import { getErrorString } from "~/Utility";
 import DialogComponent from "~/components/dialog";
+import EmptyScreen from "~/components/emptyScreen";
 import ErrorComponent from "~/components/errorComponent";
 import Loading from "~/components/loading";
 import RefreshInvalidate from "~/components/refreshInvalidate";
@@ -38,6 +39,17 @@ function Blacklist() {
 
   if (blacklistError) return <ErrorComponent errorList={[blacklistError]} />;
 
+  if (Object.keys(blacklist).length === 0) {
+    return (
+      <EmptyScreen
+        invalidateKeys={invalidateKeys}
+        text={
+          "No users found on blacklist. \n To ban a user, select 'Ban' in the top right of their \n profile from the team page."
+        }
+      />
+    );
+  }
+
   return (
     <ScrollView
       refreshControl={<RefreshInvalidate invalidateKeys={invalidateKeys} />}
diff --git a/app/segments/(team)/invitelist.js b/app/segments/(team)/invitelist.js
index ca2f5c7e..56f6ddb6 100644
--- a/app/segments/(team)/invitelist.js
+++ b/app/segments/(team)/invitelist.js
@@ -12,6 +12,7 @@ import { Button, List } from "react-native-paper";
 import { themeColors } from "~/Constants";
 import { getErrorString } from "~/Utility";
 import DialogComponent from "~/components/dialog";
+import EmptyScreen from "~/components/emptyScreen";
 import ErrorComponent from "~/components/errorComponent";
 import Loading from "~/components/loading";
 import RefreshInvalidate from "~/components/refreshInvalidate";
@@ -90,59 +91,74 @@ export function Invitelist() {
           setRemoveCounter(0);
         }}
       />
-      <ScrollView
-        refreshControl={<RefreshInvalidate invalidateKeys={invalidateKeys} />}
-      >
-        <List.Section
-          style={{
-            margin: 5,
-            borderRadius: 5,
-          }}
+
+      {Object.keys(invitelist).length === 0 ? (
+        <EmptyScreen
+          invalidateKeys={invalidateKeys}
+          text={"No invites found. \n Use the input below to invite users."}
+        />
+      ) : (
+        <ScrollView
+          refreshControl={<RefreshInvalidate invalidateKeys={invalidateKeys} />}
         >
-          {Object.keys(invitelist).map((inviteId) => {
-            return (
-              <List.Item
-                title={invitelist[inviteId].email}
-                key={inviteId}
-                right={() => (
-                  <View
-                    style={{
-                      flexDirection: "row",
-                      alignItems: "center",
-                      paddingLeft: 10,
-                    }}
-                  >
-                    <Button
-                      onPress={async () => {
-                        setRemoveLoading({
-                          ...removeLoading,
-                          [inviteId]: true,
-                        });
-                        await removeInvitelist(currentTeamId, inviteId);
-                        await invalidateMultipleKeys(
-                          queryClient,
-                          invalidateKeys,
-                        );
-                        setRemoveCounter((prev) => prev + 1);
-                        setSnackbarVisible(true);
-                        setRemoveLoading({
-                          ...removeLoading,
-                          [inviteId]: false,
-                        });
-                      }}
-                      height={38} //so the button doesn't change size because of the spinner
-                      textColor={themeColors.accent}
-                      loading={removeLoading[inviteId]}
-                    >
-                      Remove
-                    </Button>
-                  </View>
-                )}
+          <List.Section
+            style={{
+              margin: 5,
+              borderRadius: 5,
+            }}
+          >
+            {Object.keys(invitelist).length === 0 ? (
+              <EmptyScreen
+                invalidateKeys={invalidateKeys}
+                text={"No invites found"}
               />
-            );
-          })}
-        </List.Section>
-      </ScrollView>
+            ) : (
+              Object.keys(invitelist).map((inviteId) => {
+                return (
+                  <List.Item
+                    title={invitelist[inviteId].email}
+                    key={inviteId}
+                    right={() => (
+                      <View
+                        style={{
+                          flexDirection: "row",
+                          alignItems: "center",
+                          paddingLeft: 10,
+                        }}
+                      >
+                        <Button
+                          onPress={async () => {
+                            setRemoveLoading({
+                              ...removeLoading,
+                              [inviteId]: true,
+                            });
+                            await removeInvitelist(currentTeamId, inviteId);
+                            await invalidateMultipleKeys(
+                              queryClient,
+                              invalidateKeys,
+                            );
+                            setRemoveCounter((prev) => prev + 1);
+                            setSnackbarVisible(true);
+                            setRemoveLoading({
+                              ...removeLoading,
+                              [inviteId]: false,
+                            });
+                          }}
+                          height={38} //so the button doesn't change size because of the spinner
+                          textColor={themeColors.accent}
+                          loading={removeLoading[inviteId]}
+                        >
+                          Remove
+                        </Button>
+                      </View>
+                    )}
+                  />
+                );
+              })
+            )}
+          </List.Section>
+        </ScrollView>
+      )}
       <Text>{statusText}</Text>
       <View
         style={{
@@ -150,6 +166,11 @@ export function Invitelist() {
           padding: 5,
           paddingLeft: 20,
           paddingRight: 35,
+          borderStyle: "solid",
+          borderWidth: 1,
+          borderRadius: 5,
+          borderColor: themeColors.border,
+          backgroundColor: themeColors.highlight,
         }}
       >
         <TextInput
diff --git a/app/segments/(team)/waitlist.js b/app/segments/(team)/waitlist.js
index 45b18875..59dd9a49 100644
--- a/app/segments/(team)/waitlist.js
+++ b/app/segments/(team)/waitlist.js
@@ -5,6 +5,7 @@ import { ActivityIndicator, Button, List } from "react-native-paper";
 import { themeColors } from "~/Constants";
 import { getErrorString } from "~/Utility";
 import DialogComponent from "~/components/dialog";
+import EmptyScreen from "~/components/emptyScreen";
 import ErrorComponent from "~/components/errorComponent";
 import Loading from "~/components/loading";
 import RefreshInvalidate from "~/components/refreshInvalidate";
@@ -42,6 +43,17 @@ function Waitlist() {
 
   const invalidateKeys = [["waitlist"], ["userInfo"]];
 
+  if (Object.keys(waitlist).length === 0) {
+    return (
+      <EmptyScreen
+        invalidateKeys={invalidateKeys}
+        text={
+          "No users found on waitlist. \n Users will be added upon signing up and \n clicking  'Request to Join Team'."
+        }
+      />
+    );
+  }
+
   return (
     <ScrollView
       refreshControl={<RefreshInvalidate invalidateKeys={invalidateKeys} />}