diff --git a/src/client/Microsoft.Identity.Client/Microsoft.Identity.Client.csproj b/src/client/Microsoft.Identity.Client/Microsoft.Identity.Client.csproj
index 5a42d6799d..22e48d2c1b 100644
--- a/src/client/Microsoft.Identity.Client/Microsoft.Identity.Client.csproj
+++ b/src/client/Microsoft.Identity.Client/Microsoft.Identity.Client.csproj
@@ -17,10 +17,6 @@
     <TargetFrameworkAndroid10>MonoAndroid10.0</TargetFrameworkAndroid10>
     <TargetFrameworkNet6Android>net6.0-android</TargetFrameworkNet6Android>
     <TargetFrameworkNet6Ios>net6.0-ios15.4</TargetFrameworkNet6Ios>
-  </PropertyGroup>
-
-  <!-- UAP -->
-  <PropertyGroup Condition="'$(PipelineType)' != 'OneBranch' and '$(INCLUDE_MOBILE_AND_LEGACY_TFM)' != ''">
     <TargetFrameworkUap>uap10.0.17763</TargetFrameworkUap>
   </PropertyGroup>
 
@@ -234,7 +230,7 @@
     <Reference Include="System.Xml" />
 
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkUap)' And '$(PipelineType)' != 'OneBranch'">
+  <ItemGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkUap)'">
     <Compile Include="$(PathToMsalSources)\Platforms\uap\**\*.cs" />
     <Compile Include="$(PathToMsalSources)\PlatformsCommon\PlatformNotSupported\ApiConfig\SystemWebViewOptions.cs" />
     <Compile Include="$(PathToMsalSources)\Platforms\Features\WamBroker\**\*.cs" Exclude="$(PathToMsalSources)\Platforms\Features\WamBroker\win32\**\*.cs" />
diff --git a/tests/devapps/WAM/UWPWam/MainPage.xaml.cs b/tests/devapps/WAM/UWPWam/MainPage.xaml.cs
index 913606e89b..fe2a247be6 100644
--- a/tests/devapps/WAM/UWPWam/MainPage.xaml.cs
+++ b/tests/devapps/WAM/UWPWam/MainPage.xaml.cs
@@ -48,7 +48,7 @@ private IPublicClientApplication CreatePublicClient()
             var pca = PublicClientApplicationBuilder.Create(s_clientID)
                 .WithAuthority(s_authority)
                 .WithBroker(chkUseBroker.IsChecked.Value)
-                //.WithWindowsBrokerOptions(new WindowsBrokerOptions() { HeaderText = "aaa" })
+                .WithWindowsBrokerOptions(new WindowsBrokerOptions() { HeaderText = "aaa" })
                 .WithLogging((x, y, z) => Debug.WriteLine($"{x} {y}"), LogLevel.Verbose, true)
                 .Build();