diff --git a/src/PageNav.tsx b/src/PageNav.tsx
index 61fc476acf..c8c2e99d18 100644
--- a/src/PageNav.tsx
+++ b/src/PageNav.tsx
@@ -63,7 +63,7 @@ export const PageNav: React.FunctionComponent = () => {
             <Nav onSelect={onSelect}>
               <NavList>
                 <NavItem className="keycloak__page_nav__nav_item__realm-selector">
-                  <RealmSelector realmList={realmList || []} />
+                  <RealmSelector realmList={realmList.data || []} />
                 </NavItem>
               </NavList>
               <NavGroup title={t("manage")}>
diff --git a/src/client-scopes/ClientScopesSection.tsx b/src/client-scopes/ClientScopesSection.tsx
index 53148b122c..a0c9dbd4af 100644
--- a/src/client-scopes/ClientScopesSection.tsx
+++ b/src/client-scopes/ClientScopesSection.tsx
@@ -35,7 +35,7 @@ export const ClientScopesSection = () => {
         <DataLoader loader={loader}>
           {(scopes) => (
             <TableToolbar
-              count={scopes!.length}
+              count={scopes.data.length}
               first={first}
               max={max}
               onNextClick={setFirst}
@@ -50,7 +50,7 @@ export const ClientScopesSection = () => {
                 </Button>
               }
             >
-              <ClientScopeList clientScopes={scopes} />
+              <ClientScopeList clientScopes={scopes.data} />
             </TableToolbar>
           )}
         </DataLoader>
diff --git a/src/clients/ClientList.tsx b/src/clients/ClientList.tsx
index 1c91b18538..4756402057 100644
--- a/src/clients/ClientList.tsx
+++ b/src/clients/ClientList.tsx
@@ -20,6 +20,7 @@ import { exportClient } from "../util";
 
 type ClientListProps = {
   clients?: ClientRepresentation[];
+  refresh: () => void;
   baseUrl: string;
 };
 
@@ -30,7 +31,7 @@ const columns: (keyof ClientRepresentation)[] = [
   "baseUrl",
 ];
 
-export const ClientList = ({ baseUrl, clients }: ClientListProps) => {
+export const ClientList = ({ baseUrl, clients, refresh }: ClientListProps) => {
   const { t } = useTranslation("clients");
   const httpClient = useContext(HttpClientContext)!;
   const { realm } = useContext(RealmContext);
@@ -106,11 +107,12 @@ export const ClientList = ({ baseUrl, clients }: ClientListProps) => {
           },
           {
             title: t("common:delete"),
-            onClick: (_, rowId) => {
+            onClick: async (_, rowId) => {
               try {
-                httpClient.doDelete(
+                await httpClient.doDelete(
                   `/admin/realms/${realm}/clients/${data[rowId].client.id}`
                 );
+                refresh();
                 add(t("clientDeletedSuccess"), AlertVariant.success);
               } catch (error) {
                 add(`${t("clientDeleteError")} ${error}`, AlertVariant.danger);
diff --git a/src/clients/ClientsSection.tsx b/src/clients/ClientsSection.tsx
index d68310b5c0..ad9cda6deb 100644
--- a/src/clients/ClientsSection.tsx
+++ b/src/clients/ClientsSection.tsx
@@ -83,6 +83,7 @@ export const ClientsSection = () => {
           >
             <ClientList
               clients={clients}
+              refresh={loader}
               baseUrl={keycloak!.authServerUrl()!}
             />
           </TableToolbar>
diff --git a/src/clients/__tests__/ClientList.test.tsx b/src/clients/__tests__/ClientList.test.tsx
index e2580664ba..be79ab3a2c 100644
--- a/src/clients/__tests__/ClientList.test.tsx
+++ b/src/clients/__tests__/ClientList.test.tsx
@@ -8,7 +8,11 @@ import { ClientList } from "../ClientList";
 test("renders ClientList", () => {
   const container = render(
     <MemoryRouter>
-      <ClientList clients={clientMock} baseUrl="http://blog.nerdin.ch" />
+      <ClientList
+        clients={clientMock}
+        baseUrl="http://blog.nerdin.ch"
+        refresh={() => {}}
+      />
     </MemoryRouter>
   );
   expect(container).toMatchSnapshot();
diff --git a/src/components/data-loader/DataLoader.tsx b/src/components/data-loader/DataLoader.tsx
index c69b2bd2cb..5912be950b 100644
--- a/src/components/data-loader/DataLoader.tsx
+++ b/src/components/data-loader/DataLoader.tsx
@@ -4,24 +4,31 @@ import { Spinner } from "@patternfly/react-core";
 type DataLoaderProps<T> = {
   loader: () => Promise<T>;
   deps?: any[];
-  children: ((arg: T) => any) | React.ReactNode;
+  children: ((arg: Result<T>) => any) | React.ReactNode;
+};
+
+type Result<T> = {
+  data: T;
+  refresh: () => void;
 };
 
 export function DataLoader<T>(props: DataLoaderProps<T>) {
   const [data, setData] = useState<{ result: T } | undefined>(undefined);
+  const loadData = async () => {
+    const result = await props.loader();
+    setData({ result });
+  };
   useEffect(() => {
     setData(undefined);
-    const loadData = async () => {
-      const result = await props.loader();
-      setData({ result });
-    };
-
     loadData();
   }, [props]);
 
   if (data) {
     if (props.children instanceof Function) {
-      return props.children(data.result);
+      return props.children({
+        data: data.result,
+        refresh: () => loadData(),
+      });
     }
     return props.children;
   }
diff --git a/src/components/data-loader/__tests__/DataLoader.test.tsx b/src/components/data-loader/__tests__/DataLoader.test.tsx
index ed471494d9..f7b6daef09 100644
--- a/src/components/data-loader/__tests__/DataLoader.test.tsx
+++ b/src/components/data-loader/__tests__/DataLoader.test.tsx
@@ -20,9 +20,9 @@ describe("<DataLoader />", () => {
     await act(async () => {
       render(
         <DataLoader loader={loader}>
-          {(data) => (
+          {(result) => (
             <div>
-              {data.map((d, i) => (
+              {result.data.map((d, i) => (
                 <i key={i}>{d}</i>
               ))}
             </div>
diff --git a/src/context/whoami/WhoAmI.tsx b/src/context/whoami/WhoAmI.tsx
index 52eb7fe00f..43638b1def 100644
--- a/src/context/whoami/WhoAmI.tsx
+++ b/src/context/whoami/WhoAmI.tsx
@@ -68,7 +68,7 @@ export const WhoAmIContextProvider = ({ children }: WhoAmIProviderProps) => {
     <DataLoader loader={whoAmILoader}>
       {(whoamirep) => (
         <WhoAmIContext.Provider
-          value={new WhoAmI(keycloak?.realm(), whoamirep)}
+          value={new WhoAmI(keycloak?.realm(), whoamirep.data)}
         >
           {children}
         </WhoAmIContext.Provider>
diff --git a/src/realm-roles/RealmRolesSection.tsx b/src/realm-roles/RealmRolesSection.tsx
index 2d38780cb8..04e9957bcb 100644
--- a/src/realm-roles/RealmRolesSection.tsx
+++ b/src/realm-roles/RealmRolesSection.tsx
@@ -51,7 +51,7 @@ export const RealmRolesSection = () => {
           <Divider component="li" key={1} />
           <PageSection padding={{ default: "noPadding" }}>
             <TableToolbar
-              count={roles!.length}
+              count={roles.data.length}
               first={first}
               max={max}
               onNextClick={setFirst}
@@ -68,7 +68,7 @@ export const RealmRolesSection = () => {
                 </>
               }
             >
-              <RolesList roles={roles} />
+              <RolesList roles={roles.data} />
             </TableToolbar>
           </PageSection>
         </>
diff --git a/src/stories/ClientList.stories.tsx b/src/stories/ClientList.stories.tsx
index e243bf5150..79392edf42 100644
--- a/src/stories/ClientList.stories.tsx
+++ b/src/stories/ClientList.stories.tsx
@@ -10,5 +10,9 @@ export default {
 } as Meta;
 
 export const ClientListExample = () => (
-  <ClientList clients={clientMock} baseUrl="http://test.nl/" />
+  <ClientList
+    clients={clientMock}
+    baseUrl="http://test.nl/"
+    refresh={() => {}}
+  />
 );