diff --git a/backend/src/services/project/project-queue.ts b/backend/src/services/project/project-queue.ts
index 03a075d7c..722ebbd54 100644
--- a/backend/src/services/project/project-queue.ts
+++ b/backend/src/services/project/project-queue.ts
@@ -385,7 +385,7 @@ export const projectQueueFactory = ({
 
         await projectDAL.setProjectUpgradeStatus(data.projectId, null, tx);
 
-        // throw new Error("Transaction was successful!");
+        throw new Error("Transaction was successful!");
       });
     } catch (err) {
       console.log(err);
diff --git a/frontend/src/components/v2/UpgradeProjectAlert/UpgradeProjectAlert.tsx b/frontend/src/components/v2/UpgradeProjectAlert/UpgradeProjectAlert.tsx
index 9dd8b7602..25f358653 100644
--- a/frontend/src/components/v2/UpgradeProjectAlert/UpgradeProjectAlert.tsx
+++ b/frontend/src/components/v2/UpgradeProjectAlert/UpgradeProjectAlert.tsx
@@ -19,6 +19,7 @@ export const UpgradeProjectAlert = ({ project }: UpgradeProjectAlertProps): JSX.
   const { membership } = useProjectPermission();
   const upgradeProject = useUpgradeProject();
   const [currentStatus, setCurrentStatus] = useState<string | null>(null);
+  const [isUpgrading, setIsUpgrading] = useState(false);
   const {
     data: projectStatus,
     refetch: getLatestProjectStatus,
@@ -26,6 +27,10 @@ export const UpgradeProjectAlert = ({ project }: UpgradeProjectAlertProps): JSX.
   } = useGetUpgradeProjectStatus(project.id);
 
   const onUpgradeProject = useCallback(async () => {
+    if (upgradeProject.isLoading) {
+      return;
+    }
+    setIsUpgrading(true);
     const PRIVATE_KEY = localStorage.getItem("PRIVATE_KEY");
 
     if (!PRIVATE_KEY) {
@@ -42,6 +47,8 @@ export const UpgradeProjectAlert = ({ project }: UpgradeProjectAlertProps): JSX.
     });
 
     await getLatestProjectStatus();
+
+    setTimeout(() => setIsUpgrading(false), 5_000);
   }, []);
 
   useEffect(() => {
@@ -79,7 +86,8 @@ export const UpgradeProjectAlert = ({ project }: UpgradeProjectAlertProps): JSX.
   }, [projectStatus]);
 
   const isLoading =
-    (upgradeProject.isLoading ||
+    (isUpgrading ||
+      upgradeProject.isLoading ||
       currentStatus !== null ||
       (currentStatus === null && statusIsLoading)) &&
     projectStatus?.status !== "FAILED";