diff --git a/.changeset/silent-horses-fry.md b/.changeset/silent-horses-fry.md
new file mode 100644
index 0000000000..2b7c562607
--- /dev/null
+++ b/.changeset/silent-horses-fry.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-components': patch
+---
+
+Fix error in error panel, and console warnings about DOM nesting pre inside p
diff --git a/packages/core-components/src/components/ResponseErrorPanel/ResponseErrorPanel.tsx b/packages/core-components/src/components/ResponseErrorPanel/ResponseErrorPanel.tsx
index 231cd179c7..ccfb706bf9 100644
--- a/packages/core-components/src/components/ResponseErrorPanel/ResponseErrorPanel.tsx
+++ b/packages/core-components/src/components/ResponseErrorPanel/ResponseErrorPanel.tsx
@@ -76,7 +76,7 @@ export const ResponseErrorPanel = ({
           <ListItemText
             classes={{ secondary: classes.text }}
             primary="Request"
-            secondary={request}
+            secondary={request ? `${requestString}` : undefined}
           />
           <CopyTextButton text={requestString} />
         </ListItem>
@@ -87,10 +87,9 @@ export const ResponseErrorPanel = ({
           <ListItemText
             classes={{ secondary: classes.text }}
             primary="Full Error as JSON"
-            secondary={<CodeSnippet language="json" text={jsonString} />}
           />
-          <CopyTextButton text={jsonString} />
         </ListItem>
+        <CodeSnippet language="json" text={jsonString} showCopyCodeButton />
       </>
     </ErrorPanel>
   );