diff --git a/data/release-notes/enterprise-server/3-12/10.yml b/data/release-notes/enterprise-server/3-12/10.yml
index 7b9691cf5021..b4eb5163c86d 100644
--- a/data/release-notes/enterprise-server/3-12/10.yml
+++ b/data/release-notes/enterprise-server/3-12/10.yml
@@ -50,5 +50,3 @@ sections:
       {% data reusables.release-notes.2024-06-possible-frontend-5-minute-outage-during-hotpatch-upgrade %}
     - |
       When restoring from a backup snapshot, a large number of `mapper_parsing_exception` errors may be displayed.
-    - |
-      Services may respond with a `503` status due to an out of date `haproxy` configuration. This can usually be resolved with a `ghe-config-apply` run.
diff --git a/data/release-notes/enterprise-server/3-12/11.yml b/data/release-notes/enterprise-server/3-12/11.yml
index 5d5de5db014f..618ba0c825a5 100644
--- a/data/release-notes/enterprise-server/3-12/11.yml
+++ b/data/release-notes/enterprise-server/3-12/11.yml
@@ -56,5 +56,4 @@ sections:
       {% data reusables.release-notes.2024-06-possible-frontend-5-minute-outage-during-hotpatch-upgrade %}
     - |
       When restoring from a backup snapshot, a large number of `mapper_parsing_exception` errors may be displayed.
-    - |
-      Services may respond with a `503` status due to an out of date `haproxy` configuration. This can usually be resolved with a `ghe-config-apply` run.
+ 
\ No newline at end of file
diff --git a/data/release-notes/enterprise-server/3-12/12.yml b/data/release-notes/enterprise-server/3-12/12.yml
index cfe8a85df30c..67cb2b41e07a 100644
--- a/data/release-notes/enterprise-server/3-12/12.yml
+++ b/data/release-notes/enterprise-server/3-12/12.yml
@@ -31,8 +31,6 @@ sections:
       {% data reusables.release-notes.2024-06-possible-frontend-5-minute-outage-during-hotpatch-upgrade %}
     - |
       When restoring from a backup snapshot, a large number of `mapper_parsing_exception` errors may be displayed.
-    - |
-      Services may respond with a `503` status due to an out of date `haproxy` configuration. This can usually be resolved with a `ghe-config-apply` run.
     - |
       Attempting to stop replications after stopping GitHub Actions on a GitHub Enterprise Server instance would fail, reporting that MSSQL was not responding. The can be avoided by start MSSQL prior to stopping replication  `/usr/local/share/enterprise/ghe-nomad-jobs queue /etc/nomad-jobs/mssql/mssql.hcl`
     - |
diff --git a/data/release-notes/enterprise-server/3-13/5.yml b/data/release-notes/enterprise-server/3-13/5.yml
index 15e8a061fdc1..b25582c558b3 100644
--- a/data/release-notes/enterprise-server/3-13/5.yml
+++ b/data/release-notes/enterprise-server/3-13/5.yml
@@ -56,8 +56,6 @@ sections:
       When restoring data originally backed up from a 3.13 appliance onto a 3.13 appliance, the elasticsearch indices need to be reindexed before some of the data will show up.  This happens via a nightly scheduled job.  It can also be forced by running `/usr/local/share/enterprise/ghe-es-search-repair`.
     - |
       When restoring from a backup snapshot, a large number of `mapper_parsing_exception` errors may be displayed.
-    - |
-      Services may respond with a `503` status due to an out of date `haproxy` configuration. This can usually be resolved with a `ghe-config-apply` run.
     - |
       {% data reusables.release-notes.2024-11-ghe-repl-promote-primary-down %}
 
diff --git a/data/release-notes/enterprise-server/3-13/6.yml b/data/release-notes/enterprise-server/3-13/6.yml
index 382c61393ce3..4dd579d8524a 100644
--- a/data/release-notes/enterprise-server/3-13/6.yml
+++ b/data/release-notes/enterprise-server/3-13/6.yml
@@ -60,8 +60,6 @@ sections:
       When restoring data originally backed up from a 3.13 appliance onto a 3.13 appliance, the elasticsearch indices need to be reindexed before some of the data will show up.  This happens via a nightly scheduled job.  It can also be forced by running `/usr/local/share/enterprise/ghe-es-search-repair`.
     - |
       When restoring from a backup snapshot, a large number of `mapper_parsing_exception` errors may be displayed.
-    - |
-      Services may respond with a `503` status due to an out of date `haproxy` configuration. This can usually be resolved with a `ghe-config-apply` run.
     - |
       Customers doing feature version upgrade to 3.13.6 may experience issues with database migrations due to data issues during database conversions. [Added: 2024-11-08]
     - |
diff --git a/data/release-notes/enterprise-server/3-13/7.yml b/data/release-notes/enterprise-server/3-13/7.yml
index 04f8a030635d..4eb629034e31 100644
--- a/data/release-notes/enterprise-server/3-13/7.yml
+++ b/data/release-notes/enterprise-server/3-13/7.yml
@@ -24,8 +24,6 @@ sections:
       When restoring data originally backed up from a 3.13 appliance onto a 3.13 appliance, the elasticsearch indices need to be reindexed before some of the data will show up.  This happens via a nightly scheduled job.  It can also be forced by running `/usr/local/share/enterprise/ghe-es-search-repair`.
     - |
       When restoring from a backup snapshot, a large number of `mapper_parsing_exception` errors may be displayed.
-    - |
-      Services may respond with a `503` status due to an out of date `haproxy` configuration. This can usually be resolved with a `ghe-config-apply` run.
     - |
       Attempting to stop replications after stopping GitHub Actions on a GHES instanstance would fail, reporting that MSSQL was not responding.  The can be avoided by start MSSQL prior to stopping replication  `/usr/local/share/enterprise/ghe-nomad-jobs queue /etc/nomad-jobs/mssql/mssql.hcl`.
     - |
diff --git a/data/release-notes/enterprise-server/3-13/8.yml b/data/release-notes/enterprise-server/3-13/8.yml
index b5e135b76694..6fa29d866384 100644
--- a/data/release-notes/enterprise-server/3-13/8.yml
+++ b/data/release-notes/enterprise-server/3-13/8.yml
@@ -29,8 +29,6 @@ sections:
       When restoring data originally backed up from a 3.13 appliance onto a 3.13 appliance, the elasticsearch indices need to be reindexed before some of the data will show up.  This happens via a nightly scheduled job.  It can also be forced by running `/usr/local/share/enterprise/ghe-es-search-repair`.
     - |
       When restoring from a backup snapshot, a large number of `mapper_parsing_exception` errors may be displayed.
-    - |
-      Services may respond with a `503` status due to an out of date `haproxy` configuration. This can usually be resolved with a `ghe-config-apply` run.
     - |
       Attempting to stop replications after stopping GitHub Actions on a GitHub Enterprise Server instance would fail, reporting that MSSQL was not responding. The can be avoided by start MSSQL prior to stopping replication  `/usr/local/share/enterprise/ghe-nomad-jobs queue /etc/nomad-jobs/mssql/mssql.hcl`
     - |
diff --git a/data/release-notes/enterprise-server/3-14/2.yml b/data/release-notes/enterprise-server/3-14/2.yml
index 7abd992dfb34..9a87c808aade 100644
--- a/data/release-notes/enterprise-server/3-14/2.yml
+++ b/data/release-notes/enterprise-server/3-14/2.yml
@@ -76,8 +76,6 @@ sections:
       When enabling automatic update checks for the first time in the Management Console, the status is not dynamically reflected until the "Updates" page is reloaded.
     - |
       When restoring from a backup snapshot, a large number of `mapper_parsing_exception` errors may be displayed.
-    - |
-      Services may respond with a `503` status due to an out of date `haproxy` configuration. This can usually be resolved with a `ghe-config-apply` run.
     - |
       Images embedded in wiki pages may stop rendering shortly after being published. [Updated: 2024-10-16]
     - |
diff --git a/data/release-notes/enterprise-server/3-14/3.yml b/data/release-notes/enterprise-server/3-14/3.yml
index 0787e9664f16..7ae837035003 100644
--- a/data/release-notes/enterprise-server/3-14/3.yml
+++ b/data/release-notes/enterprise-server/3-14/3.yml
@@ -74,8 +74,6 @@ sections:
       When enabling automatic update checks for the first time in the Management Console, the status is not dynamically reflected until the "Updates" page is reloaded.
     - |
       When restoring from a backup snapshot, a large number of `mapper_parsing_exception` errors may be displayed.
-    - |
-      Services may respond with a `503` status due to an out of date `haproxy` configuration. This can usually be resolved with a `ghe-config-apply` run.
     - |
       Customers doing feature version upgrade to 3.14.3 may experience issues with database migrations due to data issues during database conversions. [Added: 2024-11-08]
     - |
diff --git a/data/release-notes/enterprise-server/3-14/4.yml b/data/release-notes/enterprise-server/3-14/4.yml
index 2183c8e52711..03660b2338fc 100644
--- a/data/release-notes/enterprise-server/3-14/4.yml
+++ b/data/release-notes/enterprise-server/3-14/4.yml
@@ -34,8 +34,6 @@ sections:
       When enabling automatic update checks for the first time in the Management Console, the status is not dynamically reflected until the "Updates" page is reloaded.
     - |
       When restoring from a backup snapshot, a large number of `mapper_parsing_exception` errors may be displayed.
-    - |
-      Services may respond with a `503` status due to an out of date `haproxy` configuration. This can usually be resolved with a `ghe-config-apply` run.
     - |
       Attempting to stop replications after stopping GitHub Actions on a GHES instanstance would fail, reporting that MSSQL was not responding.  The can be avoided by start MSSQL prior to stopping replication `/usr/local/share/enterprise/ghe-nomad-jobs queue /etc/nomad-jobs/mssql/mssql.hcl`.
     - |
diff --git a/data/release-notes/enterprise-server/3-14/5.yml b/data/release-notes/enterprise-server/3-14/5.yml
index 394decab147f..805b3a6ea6e3 100644
--- a/data/release-notes/enterprise-server/3-14/5.yml
+++ b/data/release-notes/enterprise-server/3-14/5.yml
@@ -39,8 +39,6 @@ sections:
       When enabling automatic update checks for the first time in the Management Console, the status is not dynamically reflected until the "Updates" page is reloaded.
     - |
       When restoring from a backup snapshot, a large number of `mapper_parsing_exception` errors may be displayed.
-    - |
-      Services may respond with a `503` status due to an out of date `haproxy` configuration. This can usually be resolved with a `ghe-config-apply` run.
     - |
       Attempting to stop replications after stopping GitHub Actions on a GitHub Enterprise Server instance would fail, reporting that MSSQL was not responding. The can be avoided by start MSSQL prior to stopping replication  `/usr/local/share/enterprise/ghe-nomad-jobs queue /etc/nomad-jobs/mssql/mssql.hcl`
     - |
diff --git a/data/release-notes/enterprise-server/3-15/0.yml b/data/release-notes/enterprise-server/3-15/0.yml
index 01365cd42dfb..4b9f1e5b0605 100644
--- a/data/release-notes/enterprise-server/3-15/0.yml
+++ b/data/release-notes/enterprise-server/3-15/0.yml
@@ -195,8 +195,6 @@ sections:
       When enabling automatic update checks for the first time in the Management Console, the status is not dynamically reflected until the "Updates" page is reloaded.
     - |
       When restoring from a backup snapshot, a large number of `mapper_parsing_exception` errors may be displayed.
-    - |
-      Services may respond with a `503` status due to an out of date `haproxy` configuration. This can usually be resolved with a `ghe-config-apply` run.
     - |
       Customers doing feature version upgrade to 3.14.3 may experience issues with database migrations due to data issues during database conversions.
     - |
diff --git a/src/search/components/input/AskAIResults.tsx b/src/search/components/input/AskAIResults.tsx
index 43b52df3cb90..19060614aa24 100644
--- a/src/search/components/input/AskAIResults.tsx
+++ b/src/search/components/input/AskAIResults.tsx
@@ -195,6 +195,18 @@ export function AskAIResults({
               let parsedLine
               try {
                 parsedLine = JSON.parse(line)
+                // If midstream there is an error, like a connection reset / lost, our backend will send an error JSON
+                if (parsedLine?.errors) {
+                  sendAISearchResultEvent({
+                    sources: [],
+                    message: JSON.stringify(parsedLine.errors),
+                    eventGroupId: askAIEventGroupId.current,
+                    couldNotAnswer: false,
+                    status: 500,
+                  })
+                  setAISearchError()
+                  return
+                }
               } catch (e) {
                 console.error(
                   'Failed to parse JSON:',
diff --git a/src/search/components/input/SearchOverlay.tsx b/src/search/components/input/SearchOverlay.tsx
index c9f316a8decd..075622f6df8d 100644
--- a/src/search/components/input/SearchOverlay.tsx
+++ b/src/search/components/input/SearchOverlay.tsx
@@ -131,7 +131,7 @@ export function SearchOverlay({
     }
 
     // If it's the initial fetch, show the spinner immediately
-    if (!aiAutocompleteOptions.length && !generalSearchResults.length) {
+    if (!aiAutocompleteOptions.length && !generalSearchResults.length && searchLoading) {
       return setShowSpinner(true)
     }