diff --git a/src/Api/Controllers/MiscController.cs b/src/Api/Controllers/MiscController.cs
index f03fd3fbbd..b317898500 100644
--- a/src/Api/Controllers/MiscController.cs
+++ b/src/Api/Controllers/MiscController.cs
@@ -13,7 +13,8 @@ namespace Bit.Api.Controllers
         private readonly BitPayClient _bitPayClient;
         private readonly GlobalSettings _globalSettings;
 
-        public MiscController(BitPayClient bitPayClient,
+        public MiscController(
+            BitPayClient bitPayClient,
             GlobalSettings globalSettings)
         {
             _bitPayClient = bitPayClient;
diff --git a/src/Api/Startup.cs b/src/Api/Startup.cs
index 8323ebd2a0..a4aed34275 100644
--- a/src/Api/Startup.cs
+++ b/src/Api/Startup.cs
@@ -58,13 +58,14 @@ namespace Bit.Api
             // Caching
             services.AddMemoryCache();
 
+            // BitPay
+            services.AddSingleton<BitPayClient>();
+
             if(!globalSettings.SelfHosted)
             {
                 // Rate limiting
                 services.AddSingleton<IIpPolicyStore, MemoryCacheIpPolicyStore>();
                 services.AddSingleton<IRateLimitCounterStore, MemoryCacheRateLimitCounterStore>();
-                // BitPay
-                services.AddSingleton<BitPayClient>();
             }
 
             // Identity
diff --git a/src/Core/Utilities/BitPayClient.cs b/src/Core/Utilities/BitPayClient.cs
index 5db08f0437..4f8f59dac7 100644
--- a/src/Core/Utilities/BitPayClient.cs
+++ b/src/Core/Utilities/BitPayClient.cs
@@ -9,10 +9,13 @@ namespace Bit.Core.Utilities
 
         public BitPayClient(GlobalSettings globalSettings)
         {
-            var btcSecret = new NBitcoin.BitcoinSecret(globalSettings.BitPay.Base58Secret,
-                globalSettings.BitPay.Production ? null : NBitcoin.Network.TestNet);
-            _bpClient = new NBitpayClient.Bitpay(btcSecret.PrivateKey,
-                new Uri(globalSettings.BitPay.Production ? "https://bitpay.com/" : "https://test.bitpay.com/"));
+            if(CoreHelpers.SettingHasValue(globalSettings.BitPay.Base58Secret))
+            {
+                var btcSecret = new NBitcoin.BitcoinSecret(globalSettings.BitPay.Base58Secret,
+                    globalSettings.BitPay.Production ? null : NBitcoin.Network.TestNet);
+                _bpClient = new NBitpayClient.Bitpay(btcSecret.PrivateKey,
+                    new Uri(globalSettings.BitPay.Production ? "https://bitpay.com/" : "https://test.bitpay.com/"));
+            }
         }
 
         public Task<bool> TestAccessAsync()