diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.batch._index/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.batch._index/route.tsx
index 0572602..a45ef16 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.batch._index/route.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.batch._index/route.tsx
@@ -48,7 +48,7 @@ export default function Route({ loaderData: { data } }: Route.ComponentProps) {
       <Await resolve={data}>
         {(resolved) => (
           <>
-            <Empty className="border border-dasheds">
+            <Empty className="border border-dashed">
               <EmptyHeader>
                 <EmptyMedia variant="icon">
                   <UploadIcon />
diff --git a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.$id.submitted/route.tsx b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.$id.submitted/route.tsx
index 42aa3be..d48cca1 100644
--- a/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.$id.submitted/route.tsx
+++ b/apps/admin.saladeaula.digital/app/routes/_.$orgid.enrollments.$id.submitted/route.tsx
@@ -5,12 +5,21 @@ import {
   CheckCircle2Icon,
   ClockIcon,
   CalendarIcon,
-  UserIcon
+  UserIcon,
+  BanIcon,
+  PlusIcon
 } from 'lucide-react'
 import { Link } from 'react-router'
 import { Suspense } from 'react'
-import { ErrorBoundary } from 'react-error-boundary'
 
+import {
+  Empty,
+  EmptyContent,
+  EmptyDescription,
+  EmptyHeader,
+  EmptyMedia,
+  EmptyTitle
+} from '@repo/ui/components/ui/empty'
 import {
   Card,
   CardContent,
@@ -36,6 +45,7 @@ import { request as req } from '@repo/util/request'
 import { Skeleton } from '@repo/ui/components/skeleton'
 import { Await } from 'react-router'
 import { Abbr } from '@repo/ui/components/abbr'
+import { Button } from '@repo/ui/components/ui/button'
 
 export function meta({}: Route.MetaArgs) {
   return [{ title: 'Relatório de matrículas' }]
@@ -78,7 +88,7 @@ export default function Route({ loaderData: { data } }: Route.ComponentProps) {
           </BreadcrumbList>
         </Breadcrumb>
 
-        <Await resolve={data} errorElement={<div>Algo deu errado</div>}>
+        <Await resolve={data} errorElement={<NotFound />}>
           {({ enrolled, scheduled, sk, created_by }) => {
             const succeed = enrolled.filter(
               ({ status }) => status === 'success'
@@ -188,3 +198,28 @@ const formatted = new Intl.DateTimeFormat('pt-BR', {
   hour: '2-digit',
   minute: '2-digit'
 })
+
+function NotFound() {
+  return (
+    <>
+      <Empty className="border border-dashed">
+        <EmptyHeader>
+          <EmptyMedia variant="icon">
+            <BanIcon />
+          </EmptyMedia>
+          <EmptyTitle>Nenhum relatório aqui</EmptyTitle>
+          <EmptyDescription>
+            Matricule colaboradores de forma rápida e acompanhe seu progresso.
+          </EmptyDescription>
+        </EmptyHeader>
+        <EmptyContent>
+          <Button asChild>
+            <Link to="../enrollments/add">
+              <PlusIcon /> Matricular
+            </Link>
+          </Button>
+        </EmptyContent>
+      </Empty>
+    </>
+  )
+}
diff --git a/apps/admin.saladeaula.digital/package.json b/apps/admin.saladeaula.digital/package.json
index 175a4ab..8bfc590 100644
--- a/apps/admin.saladeaula.digital/package.json
+++ b/apps/admin.saladeaula.digital/package.json
@@ -27,7 +27,6 @@
     "meilisearch-helper": "github:sergiors/meilisearch-helper",
     "react": "^19.2.1",
     "react-dom": "^19.2.1",
-    "react-error-boundary": "^6.0.0",
     "react-router": "^7.10.1",
     "unique-names-generator": "^4.7.1",
     "zod": "^4.1.13"
diff --git a/package-lock.json b/package-lock.json
index 7b58d44..ebf7e03 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -40,7 +40,6 @@
         "meilisearch-helper": "github:sergiors/meilisearch-helper",
         "react": "^19.2.1",
         "react-dom": "^19.2.1",
-        "react-error-boundary": "^6.0.0",
         "react-router": "^7.10.1",
         "unique-names-generator": "^4.7.1",
         "zod": "^4.1.13"
@@ -5793,18 +5792,6 @@
         "react": "^19.2.1"
       }
     },
-    "node_modules/react-error-boundary": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/react-error-boundary/-/react-error-boundary-6.0.0.tgz",
-      "integrity": "sha512-gdlJjD7NWr0IfkPlaREN2d9uUZUlksrfOx7SX62VRerwXbMY6ftGCIZua1VG1aXFNOimhISsTq+Owp725b9SiA==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.12.5"
-      },
-      "peerDependencies": {
-        "react": ">=16.13.1"
-      }
-    },
     "node_modules/react-fast-compare": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",