diff --git a/src/HotChocolateGraphQL.Mobile/HotChocolateGraphQL.Mobile.csproj b/src/HotChocolateGraphQL.Mobile/HotChocolateGraphQL.Mobile.csproj
index bad77f2..668d409 100644
--- a/src/HotChocolateGraphQL.Mobile/HotChocolateGraphQL.Mobile.csproj
+++ b/src/HotChocolateGraphQL.Mobile/HotChocolateGraphQL.Mobile.csproj
@@ -50,10 +50,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.120" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="10.0.41" />
     <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.22" />
     <PackageReference Include="CommunityToolkit.Maui" Version="12.3.0" />
-    <PackageReference Include="CommunityToolkit.Maui.Markup" Version="5.1.0" />
+    <PackageReference Include="CommunityToolkit.Maui.Markup" Version="7.0.1" />
     <PackageReference Include="StrawberryShake.Maui" Version="14.3.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
     <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0" />
diff --git a/src/HotChocolateGraphQL.Mobile/Pages/BasePage.cs b/src/HotChocolateGraphQL.Mobile/Pages/BasePage.cs
index ed1013d..fa440fb 100644
--- a/src/HotChocolateGraphQL.Mobile/Pages/BasePage.cs
+++ b/src/HotChocolateGraphQL.Mobile/Pages/BasePage.cs
@@ -8,7 +8,7 @@ abstract partial  class BasePage<TViewModel> : BasePage where TViewModel : BaseV
 {
 	protected BasePage(in TViewModel viewModel, in string? title = null, in bool shouldUseSafeArea = true) : base(viewModel, title)
 	{
-		On<iOS>().SetUseSafeArea(shouldUseSafeArea);
+		SafeAreaEdges = shouldUseSafeArea ? Microsoft.Maui.SafeAreaEdges.All : Microsoft.Maui.SafeAreaEdges.None;
 		On<iOS>().SetModalPresentationStyle(UIModalPresentationStyle.FormSheet);
 	}