diff --git a/components/ui/custom/custom-alert-modal.tsx b/components/ui/custom/custom-alert-modal.tsx
index bd93c6839b..4da8ba284d 100644
--- a/components/ui/custom/custom-alert-modal.tsx
+++ b/components/ui/custom/custom-alert-modal.tsx
@@ -4,9 +4,10 @@ import React, { ReactNode } from "react";
 interface CustomAlertModalProps {
   isOpen: boolean;
   onOpenChange: (isOpen: boolean) => void;
-  title: string;
-  description: string;
+  title?: string;
+  description?: string;
   children: ReactNode;
+  className?: string;
 }
 
 export const CustomAlertModal: React.FC<CustomAlertModalProps> = ({
@@ -15,13 +16,14 @@ export const CustomAlertModal: React.FC<CustomAlertModalProps> = ({
   title,
   description,
   children,
+  className,
 }) => {
   return (
     <Modal
       isOpen={isOpen}
       onOpenChange={onOpenChange}
       size="xl"
-      className="dark:bg-prowler-blue-800"
+      className={`dark:bg-prowler-blue-800 ${className || ""}`}
       backdrop="blur"
     >
       <ModalContent className="py-4">
diff --git a/components/ui/table/data-table.tsx b/components/ui/table/data-table.tsx
index ad5a866a01..4577f1bf08 100644
--- a/components/ui/table/data-table.tsx
+++ b/components/ui/table/data-table.tsx
@@ -106,9 +106,11 @@ export function DataTable<TData, TValue>({
           </TableBody>
         </Table>
       </div>
-      <div className="flex w-full items-center space-x-2 py-4">
-        <DataTablePagination metadata={metadata} />
-      </div>
+      {metadata && (
+        <div className="flex w-full items-center space-x-2 py-4">
+          <DataTablePagination metadata={metadata} />
+        </div>
+      )}
     </>
   );
 }