diff --git a/build/ci/.azure-pipelines.yml b/build/ci/.azure-pipelines.yml
index 935589cf4c..0e9eac8820 100644
--- a/build/ci/.azure-pipelines.yml
+++ b/build/ci/.azure-pipelines.yml
@@ -55,7 +55,7 @@ jobs:
     solutionName: MauiEmbedding
 
 - template: .azure-pipelines.Wasm.yml
-- template: .azure-pipelines.UITests.Wasm.yml
+# - template: .azure-pipelines.UITests.Wasm.yml
 - template: .azure-pipelines.RuntimeTests.Skia.yml
 - template: .azure-pipelines.Changelog.yml
 
diff --git a/src/Uno.Extensions.Hosting.UI/ApplicationBuilder.cs b/src/Uno.Extensions.Hosting.UI/ApplicationBuilder.cs
index 356d2e5353..19facf6269 100644
--- a/src/Uno.Extensions.Hosting.UI/ApplicationBuilder.cs
+++ b/src/Uno.Extensions.Hosting.UI/ApplicationBuilder.cs
@@ -15,7 +15,7 @@ internal record ApplicationBuilder(Application App, LaunchActivatedEventArgs Arg
 
 	public IHost Build()
 	{
-		var builder = UnoHost.CreateDefaultBuilder(ApplicationAssembly);
+		var builder = UnoHost.CreateDefaultBuilder(ApplicationAssembly, Environment.GetCommandLineArgs());
 		foreach (var del in _delegates)
 		{
 			del(builder);
diff --git a/src/Uno.Extensions.Navigation.UI/Navigators/FrameNavigator.cs b/src/Uno.Extensions.Navigation.UI/Navigators/FrameNavigator.cs
index 32e002f926..c54b7380bf 100644
--- a/src/Uno.Extensions.Navigation.UI/Navigators/FrameNavigator.cs
+++ b/src/Uno.Extensions.Navigation.UI/Navigators/FrameNavigator.cs
@@ -173,10 +173,8 @@ viewType is null ||
 		foreach (var stackEntry in Control!.BackStack)
 		{
 			var entryRoute = Resolver.FindByView(stackEntry.SourcePageType, this);
-			if (entryRoute != null && (
-				request.Route.Contains(entryRoute.Path) ||
-				segments.Any(seg => seg.Path == entryRoute.Path)
-				))
+			if (entryRoute != null &&
+				request.Route.Contains(entryRoute.Path))
 			{
 				navSegment = navSegment.Append(entryRoute.Path);
 			}