diff --git a/client/src/components/Chat/Messages/Content/Parts/OpenAIImageGen/OpenAIImageGen.tsx b/client/src/components/Chat/Messages/Content/Parts/OpenAIImageGen/OpenAIImageGen.tsx
index f47c9c56c3..8e1279cf3e 100644
--- a/client/src/components/Chat/Messages/Content/Parts/OpenAIImageGen/OpenAIImageGen.tsx
+++ b/client/src/components/Chat/Messages/Content/Parts/OpenAIImageGen/OpenAIImageGen.tsx
@@ -238,13 +238,15 @@ export default function OpenAIImageGen({
                 height={dimensions.height}
               />
             )}
-            <Image
-              altText={filename}
-              imagePath={filepath ?? ''}
-              width={Number(dimensions.width?.split('px')[0])}
-              height={Number(dimensions.height?.split('px')[0])}
-              args={parsedArgs}
-            />
+            {filepath && (
+              <Image
+                altText={filename}
+                imagePath={filepath}
+                width={Number(dimensions.width?.split('px')[0])}
+                height={Number(dimensions.height?.split('px')[0])}
+                args={parsedArgs}
+              />
+            )}
           </div>
         </div>
       )}
diff --git a/client/src/components/Chat/Messages/Content/__tests__/OpenAIImageGen.test.tsx b/client/src/components/Chat/Messages/Content/__tests__/OpenAIImageGen.test.tsx
index 188dff5a09..da143c862b 100644
--- a/client/src/components/Chat/Messages/Content/__tests__/OpenAIImageGen.test.tsx
+++ b/client/src/components/Chat/Messages/Content/__tests__/OpenAIImageGen.test.tsx
@@ -62,13 +62,13 @@ describe('OpenAIImageGen', () => {
     jest.useRealTimers();
   });
 
-  describe('image preloading', () => {
-    it('keeps Image mounted during generation (progress < 1)', () => {
+  describe('image visibility', () => {
+    it('hides Image during generation when no filepath exists', () => {
       render(<OpenAIImageGen {...defaultProps} initialProgress={0.5} />);
-      expect(screen.getByTestId('image-component')).toBeInTheDocument();
+      expect(screen.queryByTestId('image-component')).not.toBeInTheDocument();
     });
 
-    it('shows Image when progress >= 1', () => {
+    it('shows Image when filepath is available', () => {
       render(
         <OpenAIImageGen
           {...defaultProps}
@@ -127,7 +127,7 @@ describe('OpenAIImageGen', () => {
 
     it('handles invalid JSON args gracefully', () => {
       render(<OpenAIImageGen {...defaultProps} args="invalid json" />);
-      expect(screen.getByTestId('image-component')).toBeInTheDocument();
+      expect(screen.getByTestId('progress-text')).toBeInTheDocument();
     });
 
     it('handles object args', () => {
@@ -137,7 +137,7 @@ describe('OpenAIImageGen', () => {
           args={{ prompt: 'a dog', quality: 'low', size: '512x512' }}
         />,
       );
-      expect(screen.getByTestId('image-component')).toBeInTheDocument();
+      expect(screen.getByTestId('progress-text')).toBeInTheDocument();
     });
   });