diff --git a/ui/components/findings/table/finding-detail.tsx b/ui/components/findings/table/finding-detail.tsx
index 9dbb5a3322..00c88e285f 100644
--- a/ui/components/findings/table/finding-detail.tsx
+++ b/ui/components/findings/table/finding-detail.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import { Snippet } from "@nextui-org/react";
-import ReactMarkdown from "react-markdown";
 
 import { CodeSnippet } from "@/components/ui/code-snippet/code-snippet";
 import { CustomSection } from "@/components/ui/custom";
@@ -123,21 +122,15 @@ export const FindingDetail = ({
               hideCopyButton
               hideSymbol
             >
-              {/* eslint-disable-next-line */}
-              <div className="prose prose-sm max-w-none dark:prose-invert">
-                <ReactMarkdown>{attributes.check_metadata.risk}</ReactMarkdown>
-              </div>
+              <p className="whitespace-pre-line">
+                {attributes.check_metadata.risk}
+              </p>
             </Snippet>
           </InfoField>
         )}
 
         <InfoField label="Description">
-          {/* eslint-disable-next-line */}
-          <div className="prose prose-sm max-w-none dark:prose-invert">
-            <ReactMarkdown>
-              {attributes.check_metadata.description}
-            </ReactMarkdown>
-          </div>
+          {renderValue(attributes.check_metadata.description)}
         </InfoField>
 
         <InfoField label="Status Extended">
@@ -154,15 +147,9 @@ export const FindingDetail = ({
             {attributes.check_metadata.remediation.recommendation.text && (
               <InfoField label="Recommendation">
                 <div className="flex flex-col gap-2">
-                  {/* eslint-disable-next-line */}
-                  <div className="prose prose-sm max-w-none dark:prose-invert">
-                    <ReactMarkdown>
-                      {
-                        attributes.check_metadata.remediation.recommendation
-                          .text
-                      }
-                    </ReactMarkdown>
-                  </div>
+                  <p>
+                    {attributes.check_metadata.remediation.recommendation.text}
+                  </p>
                   {attributes.check_metadata.remediation.recommendation.url && (
                     <CustomLink
                       href={
@@ -191,12 +178,12 @@ export const FindingDetail = ({
             {/* Additional Resources section */}
             {attributes.check_metadata.remediation.code.other && (
               <InfoField label="Additional Resources">
-                {/* eslint-disable-next-line */}
-                <div className="prose prose-sm max-w-none dark:prose-invert">
-                  <ReactMarkdown>
-                    {attributes.check_metadata.remediation.code.other}
-                  </ReactMarkdown>
-                </div>
+                <CustomLink
+                  href={attributes.check_metadata.remediation.code.other}
+                  size="sm"
+                >
+                  View documentation
+                </CustomLink>
               </InfoField>
             )}
           </div>