diff --git a/app/react/components/ImageConfigFieldset/RateLimits.tsx b/app/react/components/ImageConfigFieldset/RateLimits.tsx
index 6bd88fb43..d8d3875a5 100644
--- a/app/react/components/ImageConfigFieldset/RateLimits.tsx
+++ b/app/react/components/ImageConfigFieldset/RateLimits.tsx
@@ -38,7 +38,7 @@ export function RateLimits({
 
   if (
     !environmentQuery.data ||
-    registryQuery.isLoading ||
+    registryQuery.isInitialLoading ||
     !isDockerHubRegistry
   ) {
     return null;
diff --git a/app/react/kubernetes/applications/DetailsView/AppYAMLEditor/useApplicationYAML.ts b/app/react/kubernetes/applications/DetailsView/AppYAMLEditor/useApplicationYAML.ts
index c360876db..8016e5ff6 100644
--- a/app/react/kubernetes/applications/DetailsView/AppYAMLEditor/useApplicationYAML.ts
+++ b/app/react/kubernetes/applications/DetailsView/AppYAMLEditor/useApplicationYAML.ts
@@ -75,12 +75,12 @@ export function useApplicationYAML() {
   }, [applicationYAML, autoScalarYAML, servicesYAML]);
 
   const isApplicationYAMLLoading =
-    applicationQuery.isLoading ||
-    servicesQuery.isLoading ||
-    autoScalarsQuery.isLoading ||
-    applicationYAMLQuery.isLoading ||
-    servicesYAMLQuery.isLoading ||
-    autoScalarYAMLQuery.isLoading;
+    applicationQuery.isInitialLoading ||
+    servicesQuery.isInitialLoading ||
+    autoScalarsQuery.isInitialLoading ||
+    applicationYAMLQuery.isInitialLoading ||
+    servicesYAMLQuery.isInitialLoading ||
+    autoScalarYAMLQuery.isInitialLoading;
 
   return { fullApplicationYaml, isApplicationYAMLLoading };
 }