diff --git a/src/MAUI/Maui.Samples/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml.cs b/src/MAUI/Maui.Samples/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml.cs
index 7ddadca921..d94efd11e1 100644
--- a/src/MAUI/Maui.Samples/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml.cs
+++ b/src/MAUI/Maui.Samples/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml.cs
@@ -9,6 +9,7 @@
 
 using Esri.ArcGISRuntime.ArcGISServices;
 using Esri.ArcGISRuntime.Data;
+using Esri.ArcGISRuntime.Geometry;
 using Esri.ArcGISRuntime.Mapping;
 using Esri.ArcGISRuntime.Security;
 using System.Diagnostics;
@@ -84,7 +85,8 @@ private async Task Initialize()
                 await _featureLayer.LoadAsync();
 
                 // When the feature layer has loaded set the viewpoint and update the UI.
-                await MyMapView.SetViewpointAsync(new Viewpoint(_featureLayer.FullExtent));
+                var startingExtent = new Envelope(-9812291, 5126950, -9811639, 5127468, SpatialReferences.WebMercator);
+                await MyMapView.SetViewpointAsync(new Viewpoint(startingExtent));
 
                 // Enable the UI.
                 CreateVersionButton.IsEnabled = true;
diff --git a/src/WPF/WPF.Viewer/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml.cs b/src/WPF/WPF.Viewer/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml.cs
index f287e3f7e0..5e668f4577 100644
--- a/src/WPF/WPF.Viewer/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml.cs
+++ b/src/WPF/WPF.Viewer/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml.cs
@@ -9,6 +9,7 @@
 
 using Esri.ArcGISRuntime.ArcGISServices;
 using Esri.ArcGISRuntime.Data;
+using Esri.ArcGISRuntime.Geometry;
 using Esri.ArcGISRuntime.Mapping;
 using Esri.ArcGISRuntime.Security;
 using Esri.ArcGISRuntime.UI.Controls;
@@ -88,7 +89,8 @@ private async Task Initialize()
                 await _featureLayer.LoadAsync();
 
                 // When the feature layer has loaded set the viewpoint and update the UI.
-                await MyMapView.SetViewpointAsync(new Viewpoint(_featureLayer.FullExtent));
+                var startingExtent = new Envelope(-9812291, 5126950, -9811639, 5127468, SpatialReferences.WebMercator);
+                await MyMapView.SetViewpointAsync(new Viewpoint(startingExtent));
 
                 // Enable the UI.
                 CreateVersionButton.IsEnabled = true;
diff --git a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml.cs b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml.cs
index 3c8e3ea27d..cf3e7bb631 100644
--- a/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml.cs
+++ b/src/WinUI/ArcGIS.WinUI.Viewer/Samples/Data/EditBranchVersioning/EditBranchVersioning.xaml.cs
@@ -9,6 +9,7 @@
 
 using Esri.ArcGISRuntime.ArcGISServices;
 using Esri.ArcGISRuntime.Data;
+using Esri.ArcGISRuntime.Geometry;
 using Esri.ArcGISRuntime.Mapping;
 using Esri.ArcGISRuntime.Security;
 using Esri.ArcGISRuntime.UI.Controls;
@@ -89,7 +90,8 @@ private async Task Initialize()
                 await _featureLayer.LoadAsync();
 
                 // When the feature layer has loaded set the viewpoint and update the UI.
-                await MyMapView.SetViewpointAsync(new Viewpoint(_featureLayer.FullExtent));
+                var startingExtent = new Envelope(-9812291, 5126950, -9811639, 5127468, SpatialReferences.WebMercator);
+                await MyMapView.SetViewpointAsync(new Viewpoint(startingExtent));
 
                 // Enable the UI.
                 CreateVersionButton.IsEnabled = true;