diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor
index 368444c8..8a549453 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server.Client/Pages/SenderEditorPage.razor
@@ -1,4 +1,4 @@
-@page "/sender/editor2"
+@page "/sender/editor"
 @rendermode InteractiveWebAssembly
 @using DevExpress.Blazor.Reporting.Models
 @using DevExpress.Blazor
@@ -891,7 +891,7 @@
 
             if (previousEnvelopeId != result.Id)
             {
-                NavigationManager.NavigateTo($"/sender/editor2?envelopeId={result.Id}", forceLoad: false);
+                NavigationManager.NavigateTo($"/sender/editor?envelopeId={result.Id}", forceLoad: false);
             }
 
             NavigationManager.NavigateTo("/sender", forceLoad: false);
diff --git a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeSenderEditorPage.razor b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeSenderEditorPage.razor
index 85a68a23..e2d0199c 100644
--- a/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeSenderEditorPage.razor
+++ b/EnvelopeGenerator.Server/EnvelopeGenerator.Server/Components/Pages/EnvelopeSenderEditorPage.razor
@@ -1,4 +1,4 @@
-@page "/sender/editor"
+@page "/sender/editor_legacy"
 @rendermode InteractiveServer
 @using DevExpress.Blazor.PdfViewer
 @using DevExpress.Blazor.Reporting.Models
@@ -543,7 +543,7 @@
             var editQuery = EnvelopeId.HasValue && EnvelopeId.Value > 0
                 ? $"&envelopeId={EnvelopeId.Value}"
                 : string.Empty;
-            NavigationManager.NavigateTo($"/sender/editor?esid={sid}{editQuery}", forceLoad: false);
+            NavigationManager.NavigateTo($"/sender/editor_legacy?esid={sid}{editQuery}", forceLoad: false);
         }
     }
 
@@ -837,7 +837,7 @@
             if (previousEnvelopeId != result.Id)
             {
                 var sid = string.IsNullOrWhiteSpace(Esid) ? Guid.NewGuid().ToString("N") : Esid;
-                NavigationManager.NavigateTo($"/sender/editor?esid={sid}&envelopeId={result.Id}", forceLoad: false);
+                NavigationManager.NavigateTo($"/sender/editor_legacy?esid={sid}&envelopeId={result.Id}", forceLoad: false);
             }
 
             NavigationManager.NavigateTo("/sender", forceLoad: false);