diff --git a/apps/web/src/app/(dashboard)/documents/upload-document.tsx b/apps/web/src/app/(dashboard)/documents/upload-document.tsx
index 28ddd4318..26f1e795c 100644
--- a/apps/web/src/app/(dashboard)/documents/upload-document.tsx
+++ b/apps/web/src/app/(dashboard)/documents/upload-document.tsx
@@ -2,7 +2,6 @@
 
 import { useMemo, useState } from 'react';
 
-import Link from 'next/link';
 import { useRouter } from 'next/navigation';
 
 import { Loader } from 'lucide-react';
@@ -139,27 +138,6 @@ export const UploadDocument = ({ className, team }: UploadDocumentProps) => {
           <Loader className="text-muted-foreground h-12 w-12 animate-spin" />
         </div>
       )}
-
-      {team?.id === undefined && remaining.documents === 0 && (
-        <div className="bg-background/60 absolute inset-0 flex items-center justify-center rounded-lg backdrop-blur-sm">
-          <div className="text-center">
-            <h2 className="text-muted-foreground/80 text-xl font-semibold">
-              You have reached your document limit.
-            </h2>
-
-            <p className="text-muted-foreground/60 mt-2 text-sm">
-              You can upload up to {quota.documents} documents per month on your current plan.
-            </p>
-
-            <Link
-              className="text-primary hover:text-primary/80 mt-6 block font-medium"
-              href="/settings/billing"
-            >
-              Upgrade your account to upload more documents.
-            </Link>
-          </div>
-        </div>
-      )}
     </div>
   );
 };
diff --git a/packages/tailwind-config/index.cjs b/packages/tailwind-config/index.cjs
index 81706fd37..92222462f 100644
--- a/packages/tailwind-config/index.cjs
+++ b/packages/tailwind-config/index.cjs
@@ -28,6 +28,9 @@ module.exports = {
           DEFAULT: 'hsl(var(--secondary))',
           foreground: 'hsl(var(--secondary-foreground))',
         },
+        warning: {
+          DEFAULT: 'hsl(var(--warning))',
+        },
         destructive: {
           DEFAULT: 'hsl(var(--destructive))',
           foreground: 'hsl(var(--destructive-foreground))',
diff --git a/packages/ui/lib/document-dropzone-constants.ts b/packages/ui/lib/document-dropzone-constants.ts
new file mode 100644
index 000000000..2f76b8ceb
--- /dev/null
+++ b/packages/ui/lib/document-dropzone-constants.ts
@@ -0,0 +1,118 @@
+import type { Variants } from 'framer-motion';
+
+export const DocumentDropzoneContainerVariants: Variants = {
+  initial: {
+    scale: 1,
+  },
+  animate: {
+    scale: 1,
+  },
+  hover: {
+    transition: {
+      staggerChildren: 0.05,
+    },
+  },
+};
+
+export const DocumentDropzoneCardLeftVariants: Variants = {
+  initial: {
+    x: 40,
+    y: -10,
+    rotate: -14,
+  },
+  animate: {
+    x: 40,
+    y: -10,
+    rotate: -14,
+  },
+  hover: {
+    x: -25,
+    y: -25,
+    rotate: -22,
+  },
+};
+
+export const DocumentDropzoneCardRightVariants: Variants = {
+  initial: {
+    x: -40,
+    y: -10,
+    rotate: 14,
+  },
+  animate: {
+    x: -40,
+    y: -10,
+    rotate: 14,
+  },
+  hover: {
+    x: 25,
+    y: -25,
+    rotate: 22,
+  },
+};
+
+export const DocumentDropzoneCardCenterVariants: Variants = {
+  initial: {
+    x: 0,
+    y: 0,
+  },
+  animate: {
+    x: 0,
+    y: 0,
+  },
+  hover: {
+    x: 0,
+    y: -25,
+  },
+};
+
+export const DocumentDropzoneDisabledCardLeftVariants: Variants = {
+  initial: {
+    x: 40,
+    y: 30,
+    rotate: -14,
+  },
+  animate: {
+    x: 40,
+    y: 0,
+    rotate: -14,
+  },
+  hover: {
+    x: 30,
+    y: 0,
+    transition: { type: 'spring', duration: 0.25, bounce: 0.5 },
+  },
+};
+
+export const DocumentDropzoneDisabledCardRightVariants: Variants = {
+  initial: {
+    x: -40,
+    y: 30,
+    rotate: 14,
+  },
+  animate: {
+    x: -50,
+    y: 5,
+    rotate: 14,
+  },
+  hover: {
+    x: -40,
+    y: 5,
+    transition: { type: 'spring', duration: 0.25, bounce: 0.5 },
+  },
+};
+
+export const DocumentDropzoneDisabledCardCenterVariants: Variants = {
+  initial: {
+    x: 20,
+    y: 0,
+  },
+  animate: {
+    x: -10,
+    y: 0,
+  },
+  hover: {
+    x: -20,
+    y: 0,
+    rotate: -5,
+  },
+};
diff --git a/packages/ui/primitives/document-dropzone.tsx b/packages/ui/primitives/document-dropzone.tsx
index 6caf6d040..916798b20 100644
--- a/packages/ui/primitives/document-dropzone.tsx
+++ b/packages/ui/primitives/document-dropzone.tsx
@@ -1,90 +1,27 @@
 'use client';
 
-import type { Variants } from 'framer-motion';
+import Link from 'next/link';
+
 import { motion } from 'framer-motion';
-import { Plus } from 'lucide-react';
+import { AlertTriangle, Plus } from 'lucide-react';
 import { useDropzone } from 'react-dropzone';
 
 import { APP_DOCUMENT_UPLOAD_SIZE_LIMIT } from '@documenso/lib/constants/app';
 import { megabytesToBytes } from '@documenso/lib/universal/unit-convertions';
 
+import {
+  DocumentDropzoneCardCenterVariants,
+  DocumentDropzoneCardLeftVariants,
+  DocumentDropzoneCardRightVariants,
+  DocumentDropzoneContainerVariants,
+  DocumentDropzoneDisabledCardCenterVariants,
+  DocumentDropzoneDisabledCardLeftVariants,
+  DocumentDropzoneDisabledCardRightVariants,
+} from '../lib/document-dropzone-constants';
 import { cn } from '../lib/utils';
+import { Button } from './button';
 import { Card, CardContent } from './card';
 
-const DocumentDropzoneContainerVariants: Variants = {
-  initial: {
-    scale: 1,
-  },
-  animate: {
-    scale: 1,
-  },
-  hover: {
-    transition: {
-      staggerChildren: 0.05,
-    },
-  },
-};
-
-const DocumentDropzoneCardLeftVariants: Variants = {
-  initial: {
-    x: 40,
-    y: -10,
-    rotate: -14,
-  },
-  animate: {
-    x: 40,
-    y: -10,
-    rotate: -14,
-  },
-  hover: {
-    x: -25,
-    y: -25,
-    rotate: -22,
-  },
-};
-
-const DocumentDropzoneCardRightVariants: Variants = {
-  initial: {
-    x: -40,
-    y: -10,
-    rotate: 14,
-  },
-  animate: {
-    x: -40,
-    y: -10,
-    rotate: 14,
-  },
-  hover: {
-    x: 25,
-    y: -25,
-    rotate: 22,
-  },
-};
-
-const DocumentDropzoneCardCenterVariants: Variants = {
-  initial: {
-    x: 0,
-    y: 0,
-  },
-  animate: {
-    x: 0,
-    y: 0,
-  },
-  hover: {
-    x: 0,
-    y: -25,
-  },
-};
-
-const DocumentDescription = {
-  document: {
-    headline: 'Add a document',
-  },
-  template: {
-    headline: 'Upload Template Document',
-  },
-};
-
 export type DocumentDropzoneProps = {
   className?: string;
   disabled?: boolean;
@@ -100,10 +37,18 @@ export const DocumentDropzone = ({
   onDrop,
   onDropRejected,
   disabled,
-  disabledMessage = 'You cannot upload documents at this time.',
+  disabledMessage = 'You can upload up to 5 documents per month on your current plan.',
   type = 'document',
   ...props
 }: DocumentDropzoneProps) => {
+  const DocumentDescription = {
+    document: {
+      headline: disabled ? 'You have reached your document limit.' : 'Add a document',
+    },
+    template: {
+      headline: 'Upload Template Document',
+    },
+  };
   const { getRootProps, getInputProps } = useDropzone({
     accept: {
       'application/pdf': ['.pdf'],
@@ -125,66 +70,101 @@ export const DocumentDropzone = ({
 
   return (
     <motion.div
-      className={cn('flex aria-disabled:cursor-not-allowed', className)}
+      className={cn('flex', className)}
       variants={DocumentDropzoneContainerVariants}
       initial="initial"
       animate="animate"
       whileHover="hover"
-      aria-disabled={disabled}
     >
       <Card
         role="button"
         className={cn(
-          'focus-visible:ring-ring ring-offset-background flex flex-1 cursor-pointer flex-col items-center justify-center focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 aria-disabled:pointer-events-none aria-disabled:opacity-60',
+          'focus-visible:ring-ring ring-offset-background flex flex-1 cursor-pointer flex-col items-center justify-center focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2',
           className,
         )}
-        gradient={true}
+        gradient={!disabled}
         degrees={120}
         aria-disabled={disabled}
         {...getRootProps()}
         {...props}
       >
         <CardContent className="text-muted-foreground/40 flex flex-col items-center justify-center p-6">
-          {/* <FilePlus strokeWidth="1px" className="h-16 w-16"/> */}
-          <div className="flex">
-            <motion.div
-              className="border-muted-foreground/20 group-hover:border-documenso/80 dark:bg-muted/80 a z-10 flex aspect-[3/4] w-24 origin-top-right -rotate-[22deg] flex-col gap-y-1 rounded-lg border bg-white/80 px-2 py-4 backdrop-blur-sm"
-              variants={!disabled ? DocumentDropzoneCardLeftVariants : undefined}
-            >
-              <div className="bg-muted-foreground/20 group-hover:bg-documenso h-2 w-full rounded-[2px]" />
-              <div className="bg-muted-foreground/20 group-hover:bg-documenso h-2 w-5/6 rounded-[2px]" />
-              <div className="bg-muted-foreground/20 group-hover:bg-documenso h-2 w-full rounded-[2px]" />
-            </motion.div>
+          {disabled ? (
+            // Disabled State
+            <div className="flex">
+              <motion.div
+                className="group-hover:bg-destructive/2 border-muted-foreground/20 group-hover:border-destructive/10 dark:bg-muted/80 a z-10 flex aspect-[3/4] w-24 origin-top-right -rotate-[22deg] flex-col gap-y-1 rounded-lg border bg-white/80 px-2 py-4 backdrop-blur-sm"
+                variants={disabled ? DocumentDropzoneDisabledCardLeftVariants : undefined}
+              >
+                <div className="bg-muted-foreground/10 group-hover:bg-destructive/10 h-2 w-full rounded-[2px]" />
+                <div className="bg-muted-foreground/10 group-hover:bg-destructive/10 h-2 w-5/6 rounded-[2px]" />
+                <div className="bg-muted-foreground/10 group-hover:bg-destructive/10 h-2 w-full rounded-[2px]" />
+              </motion.div>
 
-            <motion.div
-              className="border-muted-foreground/20 group-hover:border-documenso/80 dark:bg-muted/80 z-20 flex aspect-[3/4] w-24 flex-col items-center justify-center gap-y-1 rounded-lg border bg-white/80 px-2 py-4 backdrop-blur-sm"
-              variants={!disabled ? DocumentDropzoneCardCenterVariants : undefined}
-            >
-              <Plus
-                strokeWidth="2px"
-                className="text-muted-foreground/20 group-hover:text-documenso h-12 w-12"
-              />
-            </motion.div>
+              <motion.div
+                className="group-hover:bg-destructive/5 border-muted-foreground/20 group-hover:border-destructive/50 dark:bg-muted/80 z-20 flex aspect-[3/4] w-24 flex-col items-center justify-center gap-y-1 rounded-lg border bg-white/80 px-2 py-4 backdrop-blur-sm"
+                variants={disabled ? DocumentDropzoneDisabledCardCenterVariants : undefined}
+              >
+                <AlertTriangle
+                  strokeWidth="2px"
+                  className="text-muted-foreground/20 group-hover:text-destructive h-12 w-12"
+                />
+              </motion.div>
 
-            <motion.div
-              className="border-muted-foreground/20 group-hover:border-documenso/80 dark:bg-muted/80 z-10 flex aspect-[3/4] w-24 origin-top-left rotate-[22deg] flex-col gap-y-1 rounded-lg border bg-white/80 px-2 py-4 backdrop-blur-sm"
-              variants={!disabled ? DocumentDropzoneCardRightVariants : undefined}
-            >
-              <div className="bg-muted-foreground/20 group-hover:bg-documenso h-2 w-full rounded-[2px]" />
-              <div className="bg-muted-foreground/20 group-hover:bg-documenso h-2 w-5/6 rounded-[2px]" />
-              <div className="bg-muted-foreground/20 group-hover:bg-documenso h-2 w-full rounded-[2px]" />
-            </motion.div>
-          </div>
+              <motion.div
+                className="group-hover:bg-destructive/2 border-muted-foreground/20 group-hover:border-destructive/10 dark:bg-muted/80 z-10 flex aspect-[3/4] w-24 origin-top-left rotate-[22deg] flex-col gap-y-1 rounded-lg border bg-white/80 px-2 py-4 backdrop-blur-sm"
+                variants={disabled ? DocumentDropzoneDisabledCardRightVariants : undefined}
+              >
+                <div className="bg-muted-foreground/10 group-hover:bg-destructive/10 h-2 w-full rounded-[2px]" />
+                <div className="bg-muted-foreground/10 group-hover:bg-destructive/10 h-2 w-5/6 rounded-[2px]" />
+                <div className="bg-muted-foreground/10 group-hover:bg-destructive/10 h-2 w-full rounded-[2px]" />
+              </motion.div>
+            </div>
+          ) : (
+            // Non Disabled State
+            <div className="flex">
+              <motion.div
+                className="border-muted-foreground/20 group-hover:border-documenso/80 dark:bg-muted/80 a z-10 flex aspect-[3/4] w-24 origin-top-right -rotate-[22deg] flex-col gap-y-1 rounded-lg border bg-white/80 px-2 py-4 backdrop-blur-sm"
+                variants={!disabled ? DocumentDropzoneCardLeftVariants : undefined}
+              >
+                <div className="bg-muted-foreground/20 group-hover:bg-documenso h-2 w-full rounded-[2px]" />
+                <div className="bg-muted-foreground/20 group-hover:bg-documenso h-2 w-5/6 rounded-[2px]" />
+                <div className="bg-muted-foreground/20 group-hover:bg-documenso h-2 w-full rounded-[2px]" />
+              </motion.div>
+
+              <motion.div
+                className="border-muted-foreground/20 group-hover:border-documenso/80 dark:bg-muted/80 z-20 flex aspect-[3/4] w-24 flex-col items-center justify-center gap-y-1 rounded-lg border bg-white/80 px-2 py-4 backdrop-blur-sm"
+                variants={!disabled ? DocumentDropzoneCardCenterVariants : undefined}
+              >
+                <Plus
+                  strokeWidth="2px"
+                  className="text-muted-foreground/20 group-hover:text-documenso h-12 w-12"
+                />
+              </motion.div>
+
+              <motion.div
+                className="border-muted-foreground/20 group-hover:border-documenso/80 dark:bg-muted/80 z-10 flex aspect-[3/4] w-24 origin-top-left rotate-[22deg] flex-col gap-y-1 rounded-lg border bg-white/80 px-2 py-4 backdrop-blur-sm"
+                variants={!disabled ? DocumentDropzoneCardRightVariants : undefined}
+              >
+                <div className="bg-muted-foreground/20 group-hover:bg-documenso h-2 w-full rounded-[2px]" />
+                <div className="bg-muted-foreground/20 group-hover:bg-documenso h-2 w-5/6 rounded-[2px]" />
+                <div className="bg-muted-foreground/20 group-hover:bg-documenso h-2 w-full rounded-[2px]" />
+              </motion.div>
+            </div>
+          )}
 
           <input {...getInputProps()} />
 
-          <p className="group-hover:text-foreground text-muted-foreground mt-8 font-medium">
-            {DocumentDescription[type].headline}
-          </p>
+          <p className="text-foreground mt-8 font-medium">{DocumentDescription[type].headline}</p>
 
           <p className="text-muted-foreground/80 mt-1 text-sm">
             {disabled ? disabledMessage : 'Drag & drop your PDF here.'}
           </p>
+          {disabled && (
+            <Button className="hover:bg-warning/80 bg-warning mt-4 w-32" asChild>
+              <Link href="/settings/billing">Upgrade</Link>
+            </Button>
+          )}
         </CardContent>
       </Card>
     </motion.div>
diff --git a/packages/ui/styles/theme.css b/packages/ui/styles/theme.css
index 58dbc892d..8e488ad95 100644
--- a/packages/ui/styles/theme.css
+++ b/packages/ui/styles/theme.css
@@ -42,6 +42,8 @@
     --ring: 95.08 71.08% 67.45%;
 
     --radius: 0.5rem;
+
+    --warning: 54 96% 45%;
   }
 
   .dark {
@@ -79,6 +81,8 @@
     --ring: 95.08 71.08% 67.45%;
 
     --radius: 0.5rem;
+    
+    --warning: 54 96% 45%;
   }
 }