diff --git a/src/components/OrgApiKeysDataTable.tsx b/src/components/OrgApiKeysDataTable.tsx
index 773b2141..b6ad4bc3 100644
--- a/src/components/OrgApiKeysDataTable.tsx
+++ b/src/components/OrgApiKeysDataTable.tsx
@@ -8,12 +8,16 @@ interface DataTableProps<TData, TValue> {
     columns: ColumnDef<TData, TValue>[];
     data: TData[];
     addApiKey?: () => void;
+    onRefresh?: () => void;
+    isRefreshing?: boolean;
 }
 
 export function OrgApiKeysDataTable<TData, TValue>({
     addApiKey,
     columns,
-    data
+    data,
+    onRefresh,
+    isRefreshing
 }: DataTableProps<TData, TValue>) {
 
     const t = useTranslations();
@@ -27,6 +31,8 @@ export function OrgApiKeysDataTable<TData, TValue>({
             searchPlaceholder={t('searchApiKeys')}
             searchColumn="name"
             onAdd={addApiKey}
+            onRefresh={onRefresh}
+            isRefreshing={isRefreshing}
             addButtonText={t('apiKeysAdd')}
         />
     );
diff --git a/src/components/OrgApiKeysTable.tsx b/src/components/OrgApiKeysTable.tsx
index 52030b66..d4c81e80 100644
--- a/src/components/OrgApiKeysTable.tsx
+++ b/src/components/OrgApiKeysTable.tsx
@@ -46,6 +46,24 @@ export default function OrgApiKeysTable({
     const api = createApiClient(useEnvContext());
 
     const t = useTranslations();
+    const [isRefreshing, setIsRefreshing] = useState(false);
+
+    const refreshData = async () => {
+        console.log("Data refreshed");
+        setIsRefreshing(true);
+        try {
+            await new Promise((resolve) => setTimeout(resolve, 200));
+            router.refresh();
+        } catch (error) {
+            toast({
+                title: t("error"),
+                description: t("refreshError"),
+                variant: "destructive"
+            });
+        } finally {
+            setIsRefreshing(false);
+        }
+    };
 
     const deleteSite = (apiKeyId: string) => {
         api.delete(`/org/${orgId}/api-key/${apiKeyId}`)
@@ -195,6 +213,8 @@ export default function OrgApiKeysTable({
                 addApiKey={() => {
                     router.push(`/${orgId}/settings/api-keys/create`);
                 }}
+                onRefresh={refreshData}
+                isRefreshing={isRefreshing}
             />
         </>
     );