diff --git a/BTCPayServer/Configuration/ExternalConnectionString.cs b/BTCPayServer/Configuration/ExternalConnectionString.cs
index e5c66fc34..24c90411d 100644
--- a/BTCPayServer/Configuration/ExternalConnectionString.cs
+++ b/BTCPayServer/Configuration/ExternalConnectionString.cs
@@ -144,7 +144,7 @@ namespace BTCPayServer.Configuration
         }
         public bool? IsOnion()
         {
-            if (!this.Server.IsAbsoluteUri)
+            if (this.Server == null || !this.Server.IsAbsoluteUri)
                 return null;
             return this.Server.DnsSafeHost.EndsWith(".onion", StringComparison.OrdinalIgnoreCase);
         }
diff --git a/BTCPayServer/Views/Server/Services.cshtml b/BTCPayServer/Views/Server/Services.cshtml
index d908f5800..4794610c2 100644
--- a/BTCPayServer/Views/Server/Services.cshtml
+++ b/BTCPayServer/Views/Server/Services.cshtml
@@ -35,9 +35,8 @@
                         <td>@s.CryptoCode</td>
                         <td>
                             <span>@s.DisplayName</span>
-                            @if ((s.ConnectionString.IsOnion() is true) ||
-                                (s.ConnectionString.IsOnion() is false &&
-                                this.Context.Request.IsOnion()))
+                            @if (s.ConnectionString.IsOnion() == true || 
+                                (s.ConnectionString.IsOnion() == false && this.Context.Request.IsOnion()))
                             {
                             <span><img style="display:inline; margin-top:-8px;" src="~/img/icons/Onion_Color.svg" height="20" /></span>
                             }