diff --git a/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx b/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx
index e509521d3fa34..a2da958a74156 100644
--- a/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx
+++ b/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx
@@ -132,7 +132,7 @@ export default function ErrorAlert({
       {description && (
         <div className="error-body">
           <p>{description}</p>
-          {!isExpandable && body && (
+          {!isExpandable && (
             <span
               role="button"
               tabIndex={0}
@@ -212,8 +212,12 @@ export default function ErrorAlert({
           }
         >
           <>
-            <p>{subtitle}</p>
-            <br />
+            {subtitle && (
+              <>
+                <p>{subtitle}</p>
+                <br />
+              </>
+            )}
             {body}
           </>
         </ErrorModal>
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
index ece358c39e9fb..b8345ef21d88d 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -1165,9 +1165,9 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
             description={t(
               'We are unable to connect to your database. Click "See more" for database-provided information that may help troubleshoot the issue.',
             )}
-            stackTrace={alertErrors?.[0] || validationErrors?.description}
-            subtitle={validationErrors?.description}
+            stackTrace={alertErrors?.[0]}
             copyText={validationErrors?.description}
+            subtitle={validationErrors?.description}
           />
         </ErrorAlertContainer>
       );