diff --git a/src/app/components/pages/AdminUserManager.tsx b/src/app/components/pages/AdminUserManager.tsx
index 00a44b8e1a..f7f482bc45 100644
--- a/src/app/components/pages/AdminUserManager.tsx
+++ b/src/app/components/pages/AdminUserManager.tsx
@@ -25,7 +25,7 @@ import {skipToken} from "@reduxjs/toolkit/query";
 export const AdminUserManager = () => {
     const dispatch = useAppDispatch();
 
-    const [searchUsers, {isUninitialized: searchNotRequested}] = useAdminSearchUsersMutation();
+    const [searchUsers, {isUninitialized: searchNotRequested, isLoading: searchLoading}] = useAdminSearchUsersMutation();
     const searchResults = useAppSelector(selectors.admin.userSearch);
     const [searchQuery, setSearchQuery] = useState<AdminSearchEndpointParams>({
         postcodeRadius: "FIVE_MILES",
@@ -312,7 +312,7 @@ export const AdminUserManager = () => {
                 {/* Results */}
                 {!searchNotRequested &&
                     <ShowLoading
-                        until={searchResults}
+                        until={searchLoading ? undefined : searchResults}
                         thenRender={searchResults => {
                             return searchResults.length > 0 ?
                                 <div className="overflow-auto">
diff --git a/src/app/components/pages/SetAssignments.tsx b/src/app/components/pages/SetAssignments.tsx
index 60936bd5a6..c6ee33d3d6 100644
--- a/src/app/components/pages/SetAssignments.tsx
+++ b/src/app/components/pages/SetAssignments.tsx
@@ -298,8 +298,8 @@ export const SetAssignments = () => {
         boardTitleFilter, setBoardTitleFilter
     } = useGameboards(isAda && above["lg"](deviceSize) ? BoardViews.table : BoardViews.card, BoardLimit.six);
 
-    const isGroupsEmptyState = !(groups && groups.length > 0);
-    const isBoardsEmptyState = !(boards && boards.boards?.length > 0);
+    const isGroupsEmptyState = groups && groups.length === 0;
+    const isBoardsEmptyState = boards && boards.boards?.length === 0;
     const switchView = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
         setBoardView(e.target.value as BoardViews);
     }, [setBoardView]);
@@ -438,9 +438,9 @@ export const SetAssignments = () => {
                     <h3>Your quizzes</h3>
                     <div
                         className={classNames("mb-4", "d-flex", "flex-column", "flex-lg-row", "align-items-center", {"justify-content-start": isBoardsEmptyState}, {"justify-content-between": !isBoardsEmptyState})}>
-                        {!(boards && boards.totalResults === 0) &&
+                        {boards && boards.totalResults > 0 &&
                             <div>
-                                <p className={"d-none d-lg-block my-auto"}>{`You have ${boards?.boards.length} created quiz${boards && boards.boards?.length > 1 ? "zes" : ""}.`}</p>
+                                <p className={"d-none d-lg-block my-auto"}>{`You have ${boards.boards.length} created quiz${boards.boards.length > 1 ? "zes" : ""}.`}</p>
                             </div>
                         }
                         <div className={"w-100 w-lg-auto"}>