diff --git a/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.tsx b/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.tsx
index bd3fc7ce19a..ba75a962be8 100644
--- a/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.tsx
+++ b/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.tsx
@@ -177,13 +177,7 @@ export function DiskManagementForm() {
   /**
    * State handling
    */
-  const isLoading =
-    isAddonsLoading ||
-    isDiskAttributesLoading ||
-    isDiskUtilizationLoading ||
-    isReadReplicasLoading ||
-    isSubscriptionLoading ||
-    isCooldownLoading
+
   const isSuccess =
     isAddonsSuccess &&
     isDiskAttributesSuccess &&
@@ -192,9 +186,6 @@ export function DiskManagementForm() {
     isSubscriptionSuccess &&
     isCooldownSuccess
 
-  const error =
-    addonsError ?? diskAttributesError ?? diskUtilError ?? readReplicasError ?? subscriptionError
-
   const isRequestingChanges = data?.requested_modification !== undefined
   const readReplicas = (databases ?? []).filter((db) => db.identifier !== projectRef)
   const isPlanUpgradeRequired = subscription?.plan.id === 'free'
diff --git a/apps/studio/components/interfaces/DiskManagement/DiskManagementReviewAndSubmitDialog.tsx b/apps/studio/components/interfaces/DiskManagement/DiskManagementReviewAndSubmitDialog.tsx
index 3f77c11a654..83baf0f8ab4 100644
--- a/apps/studio/components/interfaces/DiskManagement/DiskManagementReviewAndSubmitDialog.tsx
+++ b/apps/studio/components/interfaces/DiskManagement/DiskManagementReviewAndSubmitDialog.tsx
@@ -247,7 +247,7 @@ export const DiskManagementReviewAndSubmitDialog = ({
             title="Resizing your Compute will trigger a project restart"
             description="Project will restart automatically on confirmation."
           />
-          {hasDiskConfigChanges && <DiskMangementCoolDownSection />}
+          <DiskMangementCoolDownSection visible={hasDiskConfigChanges} />
         </div>
         <DialogSectionSeparator />
         <Table>
diff --git a/apps/studio/components/interfaces/DiskManagement/ui/DiskManagementCoolDownSection.tsx b/apps/studio/components/interfaces/DiskManagement/ui/DiskManagementCoolDownSection.tsx
index 5bd20f76d57..c6d2349e0f3 100644
--- a/apps/studio/components/interfaces/DiskManagement/ui/DiskManagementCoolDownSection.tsx
+++ b/apps/studio/components/interfaces/DiskManagement/ui/DiskManagementCoolDownSection.tsx
@@ -4,11 +4,10 @@ import { useEffect, useState } from 'react'
 import CountdownTimerRadial from 'components/ui/CountdownTimer/CountdownTimerRadial'
 import { DialogSection } from 'ui'
 
-export const DiskMangementCoolDownSection = () => {
+export const DiskMangementCoolDownSection = ({ visible }: { visible: boolean }) => {
   const [progress, setProgress] = useState(100)
   const [showCountdown, setShowCountdown] = useState(false)
   const [isJumping, setIsJumping] = useState(false)
-  const [isVisible, setIsVisible] = useState(true)
 
   useEffect(() => {
     const startCountdown = () => {
@@ -40,7 +39,7 @@ export const DiskMangementCoolDownSection = () => {
 
   return (
     <AnimatePresence>
-      {isVisible && (
+      {visible && (
         <motion.div
           initial={{ opacity: 1, height: 'auto' }}
           exit={{ opacity: 0, height: 0 }}
diff --git a/apps/studio/components/interfaces/DiskManagement/ui/DiskSpaceBar.tsx b/apps/studio/components/interfaces/DiskManagement/ui/DiskSpaceBar.tsx
index 9af18b955b7..97b78913cc9 100644
--- a/apps/studio/components/interfaces/DiskManagement/ui/DiskSpaceBar.tsx
+++ b/apps/studio/components/interfaces/DiskManagement/ui/DiskSpaceBar.tsx
@@ -30,8 +30,6 @@ export default function DiskSpaceBar({ form }: DiskSpaceBarProps) {
   const {
     data: diskUtil,
     // to do, error handling
-    isLoading: isDiskUtilizationLoading,
-    error: diskUtilError,
   } = useDiskUtilizationQuery({
     projectRef: ref,
   })