diff --git a/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.tsx b/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.tsx
index 6a07084972f..818a3d88e4f 100644
--- a/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.tsx
+++ b/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.tsx
@@ -219,6 +219,7 @@ export function DiskManagementForm() {
 
   const onSubmit = async (data: DiskStorageSchemaType) => {
     let payload = data
+    setMessageState(null)
     try {
       if (
         payload.storageType !== form.formState.defaultValues?.storageType ||
diff --git a/apps/studio/components/interfaces/DiskManagement/DiskManagementReviewAndSubmitDialog.tsx b/apps/studio/components/interfaces/DiskManagement/DiskManagementReviewAndSubmitDialog.tsx
index b871945b6fd..d5e65610b10 100644
--- a/apps/studio/components/interfaces/DiskManagement/DiskManagementReviewAndSubmitDialog.tsx
+++ b/apps/studio/components/interfaces/DiskManagement/DiskManagementReviewAndSubmitDialog.tsx
@@ -21,6 +21,7 @@ import {
   DialogDescription,
   DialogFooter,
   DialogHeader,
+  DialogSection,
   DialogSectionSeparator,
   DialogTitle,
   DialogTrigger,
@@ -333,7 +334,6 @@ export const DiskManagementReviewAndSubmitDialog = ({
           <Button block size="large" type="default" onClick={() => setIsDialogOpen(false)}>
             Cancel
           </Button>
-
           <Button
             block
             type={'warning'}
@@ -346,14 +346,21 @@ export const DiskManagementReviewAndSubmitDialog = ({
           >
             Confirm changes
           </Button>
-
-          {message && (
-            <Alert_Shadcn_ variant={message.type === 'error' ? 'destructive' : 'default'}>
-              <WarningIcon />
-              <AlertTitle_Shadcn_>{message.message}</AlertTitle_Shadcn_>
-            </Alert_Shadcn_>
-          )}
         </DialogFooter>
+        {message && (
+          <>
+            <DialogSectionSeparator />
+            <DialogSection>
+              <Alert_Shadcn_
+                variant={message.type === 'error' ? 'destructive' : 'default'}
+                className=""
+              >
+                <WarningIcon />
+                <AlertTitle_Shadcn_>{message.message}</AlertTitle_Shadcn_>
+              </Alert_Shadcn_>
+            </DialogSection>
+          </>
+        )}
       </DialogContent>
     </Dialog>
   )