diff --git a/client/src/components/Messages/Content/Content.jsx b/client/src/components/Messages/Content/Content.jsx
index f891d03901..b8a474ad74 100644
--- a/client/src/components/Messages/Content/Content.jsx
+++ b/client/src/components/Messages/Content/Content.jsx
@@ -33,6 +33,8 @@ const Content = React.memo(({ content, message }) => {
   const latestMessage = useRecoilValue(store.latestMessage);
   const isInitializing = content === '<span className="result-streaming">█</span>';
   const isLatestMessage = message?.messageId === latestMessage?.messageId;
+  const currentContent = content?.replace('z-index: 1;', '') ?? '';
+  const isIFrame = currentContent.includes('<iframe');
 
   useEffect(() => {
     let timer1, timer2;
@@ -68,9 +70,8 @@ const Content = React.memo(({ content, message }) => {
     [rehypeRaw],
   ];
 
-  if (!isInitializing || !isLatestMessage) {
-    //commented out to fix bing image creator errors
-    //rehypePlugins.pop();
+  if ((!isInitializing || !isLatestMessage) && !isIFrame) {
+    rehypePlugins.pop();
   }
 
   return (
@@ -83,7 +84,9 @@ const Content = React.memo(({ content, message }) => {
         p,
       }}
     >
-      {isLatestMessage && isSubmitting && !isInitializing ? (content ?? '') + cursor : content}
+      {isLatestMessage && isSubmitting && !isInitializing
+        ? currentContent + cursor
+        : currentContent}
     </ReactMarkdown>
   );
 });