diff --git a/ui/litellm-dashboard/src/components/all_keys_table.tsx b/ui/litellm-dashboard/src/components/all_keys_table.tsx
index 403b131c65..6ecd802b65 100644
--- a/ui/litellm-dashboard/src/components/all_keys_table.tsx
+++ b/ui/litellm-dashboard/src/components/all_keys_table.tsx
@@ -450,6 +450,8 @@ export function AllKeysTable({
               columns={columns.filter(col => col.id !== 'expander') as any}
               data={filteredKeys as any}
               isLoading={isLoading}
+              loadingMessage="🚅 Loading keys..."
+              noDataMessage="No keys found"
               getRowCanExpand={() => false}
               renderSubComponent={() => <></>}
             />
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/index.tsx b/ui/litellm-dashboard/src/components/mcp_tools/index.tsx
index ae3d4fac62..c403b49668 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/index.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/index.tsx
@@ -26,6 +26,8 @@ function DataTableWrapper({
       isLoading={isLoading}
       renderSubComponent={renderSubComponent}
       getRowCanExpand={getRowCanExpand}
+      loadingMessage="🚅 Loading tools..."
+      noDataMessage="No tools found"
     />
   );
 }
diff --git a/ui/litellm-dashboard/src/components/view_logs/table.tsx b/ui/litellm-dashboard/src/components/view_logs/table.tsx
index ed728de074..51131f0dd7 100644
--- a/ui/litellm-dashboard/src/components/view_logs/table.tsx
+++ b/ui/litellm-dashboard/src/components/view_logs/table.tsx
@@ -26,6 +26,8 @@ interface DataTableProps<TData, TValue> {
   expandedRequestId?: string | null;
   onRowExpand?: (requestId: string | null) => void;
   setSelectedKeyIdInfoView?: (keyId: string | null) => void;
+  loadingMessage?: string;
+  noDataMessage?: string;
 }
 
 export function DataTable<TData extends { request_id: string }, TValue>({
@@ -36,6 +38,8 @@ export function DataTable<TData extends { request_id: string }, TValue>({
   isLoading = false,
   expandedRequestId,
   onRowExpand,
+  loadingMessage = "🚅 Loading logs...",
+  noDataMessage = "No logs found",
 }: DataTableProps<TData, TValue>) {
   const table = useReactTable({
     data,
@@ -114,7 +118,7 @@ export function DataTable<TData extends { request_id: string }, TValue>({
             <TableRow>
               <TableCell colSpan={columns.length} className="h-8 text-center">
                 <div className="text-center text-gray-500">
-                  <p>🚅 Loading logs...</p>
+                  <p>{loadingMessage}</p>
                 </div>
               </TableCell>
             </TableRow>
@@ -147,7 +151,7 @@ export function DataTable<TData extends { request_id: string }, TValue>({
           : <TableRow>
               <TableCell colSpan={columns.length} className="h-8 text-center">
                 <div className="text-center text-gray-500">
-                  <p>No logs found</p>
+                  <p>{noDataMessage}</p>
                 </div>
               </TableCell>
             </TableRow>