diff --git a/client/src/app/auth/confirm-email/[token]/page.tsx b/client/src/app/auth/confirm-email/[token]/page.tsx
index 25b65113..32943fac 100644
--- a/client/src/app/auth/confirm-email/[token]/page.tsx
+++ b/client/src/app/auth/confirm-email/[token]/page.tsx
@@ -1,26 +1,10 @@
-import Link from "next/link";
-
 import ConfirmEmailForm from "@/containers/auth/confirm-email/form";
 import AuthLayout from "@/containers/auth-layout";
 
-import { Button } from "@/components/ui/button";
-import { Card } from "@/components/ui/card";
-
 export default function ConfirmEmailPage() {
   return (
     <AuthLayout>
       <ConfirmEmailForm />
-      <Card variant="secondary" className="p-6">
-        <p className="text-sm">
-          <span className="pr-2 text-muted-foreground">
-            Didn&apos;t receive your email?
-          </span>
-          <Button variant="link" className="p-0 text-primary" asChild>
-            {/* TODO: Add correct implementation when API call is available */}
-            <Link href="/auth/signin">Resend email</Link>
-          </Button>
-        </p>
-      </Card>
     </AuthLayout>
   );
 }
diff --git a/client/src/containers/auth/confirm-email/form/index.tsx b/client/src/containers/auth/confirm-email/form/index.tsx
index d9c35582..84289988 100644
--- a/client/src/containers/auth/confirm-email/form/index.tsx
+++ b/client/src/containers/auth/confirm-email/form/index.tsx
@@ -9,7 +9,7 @@ import { useParams, useRouter, useSearchParams } from "next/navigation";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { TOKEN_TYPE_ENUM } from "@shared/schemas/auth/token-type.schema";
 import { RequestEmailUpdateSchema } from "@shared/schemas/users/request-email-update.schema";
-import { useQuery } from "@tanstack/react-query";
+import { useSuspenseQuery } from "@tanstack/react-query";
 import { z } from "zod";
 
 import { client } from "@/lib/query-client";
@@ -52,7 +52,7 @@ const NewPasswordForm: FC = () => {
     data: isValidToken,
     isFetching,
     isError,
-  } = useQuery({
+  } = useSuspenseQuery({
     queryKey: queryKeys.auth.confirmEmailToken(params.token).queryKey,
     queryFn: () => {
       return client.auth.validateToken.query({
@@ -105,15 +105,13 @@ const NewPasswordForm: FC = () => {
         <CardTitle className="text-xl font-semibold">
           Confirm your email
         </CardTitle>
-        <CardDescription className="text-muted-foreground">
-          {!isValidToken ? (
+        {!isValidToken && (
+          <CardDescription className="text-muted-foreground">
             <p className="text-sm text-destructive">
               The token is invalid or has expired.
             </p>
-          ) : (
-            <p>To create your account please fill in the details bellow.</p>
-          )}
-        </CardDescription>
+          </CardDescription>
+        )}
       </CardHeader>
       <CardContent>
         <Form {...form}>