diff --git a/src/Android/Resources/xml/app_restrictions.xml b/src/Android/Resources/xml/app_restrictions.xml
index e6f7a37c3..68b5bb0fb 100644
--- a/src/Android/Resources/xml/app_restrictions.xml
+++ b/src/Android/Resources/xml/app_restrictions.xml
@@ -5,5 +5,5 @@
     android:title="@string/SelfHostedServerUrl"
     android:restrictionType="string"
     android:description="@string/ServerUrl"
-    android:defaultValue="@null" />
+    android:defaultValue="" />
 </restrictions>
diff --git a/src/App/Utilities/AppHelpers.cs b/src/App/Utilities/AppHelpers.cs
index 82d75f96f..c039ca7a3 100644
--- a/src/App/Utilities/AppHelpers.cs
+++ b/src/App/Utilities/AppHelpers.cs
@@ -163,7 +163,7 @@ namespace Bit.App.Utilities
                         {
                             await environmentService.SetUrlsAsync(new Core.Models.Data.EnvironmentUrlData
                             {
-                                Base = setting.Value,
+                                Base = string.IsNullOrWhiteSpace(setting.Value) ? null : setting.Value,
                                 Api = environmentService.ApiUrl,
                                 Identity = environmentService.IdentityUrl,
                                 WebVault = environmentService.WebVaultUrl,