diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/PdfEditor/SenderPdfImageEditor.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/PdfEditor/SenderPdfImageEditor.razor
index ee1808ae..478b47bb 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/PdfEditor/SenderPdfImageEditor.razor
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Components/PdfEditor/SenderPdfImageEditor.razor
@@ -47,9 +47,7 @@
         {
             <div class="sender-image-editor__empty">@L("SenderEditor_NoPagesToDisplay", "Keine Seiten zur Anzeige verfügbar.")</div>
         }
-        else
-        {
-        @if (Pages.Count == 0 && !string.IsNullOrWhiteSpace(PdfDataUrl))
+        else if (Pages.Count == 0 && !string.IsNullOrWhiteSpace(PdfDataUrl))
         {
             <div class="sender-image-editor__native-preview" style="@GetZoomStyle()">
                 <iframe class="sender-image-editor__native-frame"
@@ -57,59 +55,60 @@
                         title="PDF Preview"></iframe>
             </div>
         }
+        else
+        {
+            <div class="sender-image-editor__pages" style="@GetZoomStyle()">
+                @for (var pageIndex = 0; pageIndex < PageCount; pageIndex++)
+                {
+                    var pagePreview = pageIndex < Pages.Count ? Pages[pageIndex] : null;
+                    var pageNumber = pagePreview?.PageNumber ?? (pageIndex + 1);
+                    var widthPt = pagePreview?.WidthPt ?? 595.0;
+                    var heightPt = pagePreview?.HeightPt ?? 842.0;
 
-        <div class="sender-image-editor__pages" style="@GetZoomStyle()">
-            @for (var pageIndex = 0; pageIndex < PageCount; pageIndex++)
-            {
-                var pagePreview = pageIndex < Pages.Count ? Pages[pageIndex] : null;
-                var pageNumber = pagePreview?.PageNumber ?? (pageIndex + 1);
-                var widthPt = pagePreview?.WidthPt ?? 595.0;
-                var heightPt = pagePreview?.HeightPt ?? 842.0;
+                    <div class="sender-image-editor__page-block"
+                         data-editor-page="@pageNumber"
+                         data-page-width-pt="@widthPt"
+                         data-page-height-pt="@heightPt">
+                        <div class="sender-image-editor__page-canvas"
+                             data-editor-page-canvas="@pageNumber"
+                             style="@GetPageCanvasStyle(widthPt, heightPt)">
+                            @if (!string.IsNullOrWhiteSpace(pagePreview?.ImageDataUrl))
+                            {
+                                <img class="sender-image-editor__page-image"
+                                     src="@(pagePreview!.ImageDataUrl)"
+                                     alt="PDF Page @pageNumber"
+                                     draggable="false" />
+                            }
+                            else
+                            {
+                                <div class="sender-image-editor__page-placeholder">@L("SenderEditor_PageLabel", "Seite") @pageNumber</div>
+                            }
 
-                <div class="sender-image-editor__page-block"
-                      data-editor-page="@pageNumber"
-                     data-page-width-pt="@widthPt"
-                     data-page-height-pt="@heightPt">
-                    <div class="sender-image-editor__page-canvas"
-                         data-editor-page-canvas="@pageNumber"
-                         style="@GetPageCanvasStyle(widthPt, heightPt)">
-                        @if (!string.IsNullOrWhiteSpace(pagePreview?.ImageDataUrl))
-                        {
-                            <img class="sender-image-editor__page-image"
-                                 src="@(pagePreview!.ImageDataUrl)"
-                                 alt="PDF Page @pageNumber"
-                                 draggable="false" />
-                        }
-                        else
-                        {
-                            <div class="sender-image-editor__page-placeholder">@L("SenderEditor_PageLabel", "Seite") @pageNumber</div>
-                        }
-
-                        @foreach (var field in Fields.Where(f => f.Page == pageNumber))
-                        {
-                            <div class="sender-image-editor__field"
-                                 style="@GetFieldStyle(field, widthPt, heightPt)"
-                                 title="@field.ReceiverName"
-                                 @onmousedown="args => OnFieldMouseDownAsync(args, field)"
-                                 @onmousedown:preventDefault="true"
-                                 @onclick:stopPropagation="true">
-                                <span class="sender-image-editor__field-label">@field.ReceiverName</span>
-                                <button type="button"
-                                        class="sender-image-editor__field-remove"
-                                        title='@L("Delete", "Löschen")'
-                                        draggable="false"
-                                        @onclick:stopPropagation="true"
-                                        @onclick="() => RemoveField.InvokeAsync(field.Index)">
-                                    <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 16 16" fill="none" aria-hidden="true">
-                                        <path d="M4 4L12 12M12 4L4 12" stroke="currentColor" stroke-width="2" stroke-linecap="round" />
-                                    </svg>
-                                </button>
-                            </div>
-                        }
+                            @foreach (var field in Fields.Where(f => f.Page == pageNumber))
+                            {
+                                <div class="sender-image-editor__field"
+                                     style="@GetFieldStyle(field, widthPt, heightPt)"
+                                     title="@field.ReceiverName"
+                                     @onmousedown="args => OnFieldMouseDownAsync(args, field)"
+                                     @onmousedown:preventDefault="true"
+                                     @onclick:stopPropagation="true">
+                                    <span class="sender-image-editor__field-label">@field.ReceiverName</span>
+                                    <button type="button"
+                                            class="sender-image-editor__field-remove"
+                                            title='@L("Delete", "Löschen")'
+                                            draggable="false"
+                                            @onclick:stopPropagation="true"
+                                            @onclick="() => RemoveField.InvokeAsync(field.Index)">
+                                        <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 16 16" fill="none" aria-hidden="true">
+                                            <path d="M4 4L12 12M12 4L4 12" stroke="currentColor" stroke-width="2" stroke-linecap="round" />
+                                        </svg>
+                                    </button>
+                                </div>
+                            }
+                        </div>
                     </div>
-                </div>
-            }
-        </div>
+                }
+            </div>
         }
     </div>
 </div>
diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor
index 871d3ea3..1700f7a8 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor
@@ -826,11 +826,31 @@
 
             _originalPdfBytes = document?.ByteData;
             _pdfLoaded = _originalPdfBytes is { Length: > 0 };
-            _pagePreviews = [];
-            _pageCount = _pagePreviews.Count > 0
-                ? _pagePreviews.Count
-                : EstimatePdfPageCount(_originalPdfBytes)
-                    ?? Math.Max(1, _signatureFields.Select(f => f.Page).DefaultIfEmpty(1).Max());
+
+            if (_pdfLoaded)
+            {
+                try
+                {
+                    _pagePreviews = (await PdfRenderService.RenderPagesAsync(_originalPdfBytes!))
+                        .OrderBy(p => p.PageNumber)
+                        .ToList();
+                }
+                catch (Exception renderEx)
+                {
+                    Logger.LogWarning(renderEx, "Failed to render PDF page previews for envelope {EnvelopeId}. Falling back to native preview.", envelopeId);
+                    _pagePreviews = [];
+                }
+
+                _pageCount = _pagePreviews.Count > 0
+                    ? _pagePreviews.Count
+                    : 1;
+            }
+            else
+            {
+                _pagePreviews = [];
+                _pageCount = Math.Max(1, _signatureFields.Select(f => f.Page).DefaultIfEmpty(1).Max());
+            }
+
             _fileName = $"Envelope-{envelopeId}.pdf";
             _pendingReceiverForPlacement = null;
             _loadedEnvelopeId = envelopeId;