diff --git a/invokeai/frontend/web/src/features/settingsAccordions/components/UpscaleSettingsAccordion/UpscaleWarning.tsx b/invokeai/frontend/web/src/features/settingsAccordions/components/UpscaleSettingsAccordion/UpscaleWarning.tsx
index 18d63d4f741..d12b4e62ef5 100644
--- a/invokeai/frontend/web/src/features/settingsAccordions/components/UpscaleSettingsAccordion/UpscaleWarning.tsx
+++ b/invokeai/frontend/web/src/features/settingsAccordions/components/UpscaleSettingsAccordion/UpscaleWarning.tsx
@@ -57,7 +57,11 @@ export const UpscaleWarning = () => {
     $installModelsTab.set(3);
   }, [dispatch]);
 
-  if ((!modelWarnings.length && !otherWarnings.length) || isLoading || !shouldShowButton) {
+  if (modelWarnings.length && !shouldShowButton) {
+    return null;
+  }
+
+  if ((!modelWarnings.length && !otherWarnings.length) || isLoading) {
     return null;
   }