diff --git a/samples/ControlCatalog.Web/Program.cs b/samples/ControlCatalog.Web/Program.cs
index 52acabb0fa..7d05c8e462 100644
--- a/samples/ControlCatalog.Web/Program.cs
+++ b/samples/ControlCatalog.Web/Program.cs
@@ -1,8 +1,11 @@
+using System.Runtime.Versioning;
 using Avalonia;
 using Avalonia.Web;
 using ControlCatalog;
 using ControlCatalog.Web;
 
+[assembly:SupportedOSPlatform("browser")]
+
 internal partial class Program
 {
     private static void Main(string[] args)
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
index f8eaeba897..8e47d30bcb 100644
--- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
+++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
@@ -301,7 +301,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform
 
             IsComposing = true;
 
-            _inputMethod.Client.SetPreeditText(ComposingText);
+            _inputMethod.Client?.SetPreeditText(ComposingText);
 
             return base.SetComposingText(text, newCursorPosition);
         }