diff --git a/packages/amazonq/src/app/inline/EditRendering/imageRenderer.ts b/packages/amazonq/src/app/inline/EditRendering/imageRenderer.ts
index 9af3878ef82..195879ff779 100644
--- a/packages/amazonq/src/app/inline/EditRendering/imageRenderer.ts
+++ b/packages/amazonq/src/app/inline/EditRendering/imageRenderer.ts
@@ -29,6 +29,12 @@ export async function showEdits(
         const { svgImage, startLine, newCode, origionalCodeHighlightRange } =
             await svgGenerationService.generateDiffSvg(currentFile, item.insertText as string)
 
+        // TODO: To investigate why it fails and patch [generateDiffSvg]
+        if (newCode.length === 0) {
+            getLogger('nextEditPrediction').warn('not able to apply provided edit suggestion, skip rendering')
+            return
+        }
+
         if (svgImage) {
             // display the SVG image
             await displaySvgDecoration(