diff --git a/BTCPayServer/Components/AppSales/AppSales.cs b/BTCPayServer/Components/AppSales/AppSales.cs
index 4e0d3dbe5..02670e115 100644
--- a/BTCPayServer/Components/AppSales/AppSales.cs
+++ b/BTCPayServer/Components/AppSales/AppSales.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Security.AccessControl;
 using System.Threading.Tasks;
-using BTCPayServer.Data;
-using BTCPayServer.Models.AppViewModels;
 using BTCPayServer.Services.Apps;
-using BTCPayServer.Services.Stores;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ViewComponents;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
diff --git a/BTCPayServer/Components/AppSales/AppSalesViewModel.cs b/BTCPayServer/Components/AppSales/AppSalesViewModel.cs
index d7fab9e94..3d7513cab 100644
--- a/BTCPayServer/Components/AppSales/AppSalesViewModel.cs
+++ b/BTCPayServer/Components/AppSales/AppSalesViewModel.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using BTCPayServer.Client.Models;
-using BTCPayServer.Services.Apps;
 
 namespace BTCPayServer.Components.AppSales;
 
diff --git a/BTCPayServer/Components/AppSales/Default.cshtml.js b/BTCPayServer/Components/AppSales/Default.cshtml.js
index 37472d1d7..e3cc68604 100644
--- a/BTCPayServer/Components/AppSales/Default.cshtml.js
+++ b/BTCPayServer/Components/AppSales/Default.cshtml.js
@@ -45,7 +45,6 @@ if (!window.appSales) {
             
             function addEventListeners() {
                 delegate('change', `#${id} [name="AppSalesPeriod-${appId}"]`, async e => {
-                    console.log("CHANGED", id)
                     const type = e.target.value;
                     await update(type);
                 });
diff --git a/BTCPayServer/Components/StoreLightningBalance/StoreLightningBalanceViewModel.cs b/BTCPayServer/Components/StoreLightningBalance/StoreLightningBalanceViewModel.cs
index 6bfd3eec7..d4d2a1d85 100644
--- a/BTCPayServer/Components/StoreLightningBalance/StoreLightningBalanceViewModel.cs
+++ b/BTCPayServer/Components/StoreLightningBalance/StoreLightningBalanceViewModel.cs
@@ -4,7 +4,6 @@ using BTCPayServer.Client.Models;
 using BTCPayServer.Lightning;
 using BTCPayServer.Services.Rates;
 using NBitcoin;
-using StoreData = BTCPayServer.Data.StoreData;
 
 namespace BTCPayServer.Components.StoreLightningBalance;
 
diff --git a/BTCPayServer/Components/StoreLightningServices/Default.cshtml b/BTCPayServer/Components/StoreLightningServices/Default.cshtml
index 3deb55c34..7cc0755f6 100644
--- a/BTCPayServer/Components/StoreLightningServices/Default.cshtml
+++ b/BTCPayServer/Components/StoreLightningServices/Default.cshtml
@@ -2,14 +2,14 @@
 
 @if (Model.Services != null && Model.Services.Any())
 {
-    <div id="StoreLightningServices-@Model.Store.Id" class="widget store-lightning-services">
+    <div id="StoreLightningServices-@Model.StoreId" class="widget store-lightning-services">
         <header class="mb-4">
             <h6 text-translate="true">Lightning Services</h6>
             <a
                 asp-controller="UIPublicLightningNodeInfo"
                 asp-action="ShowLightningNodeInfo"app-top-items
                 asp-route-cryptoCode="@Model.CryptoCode"
-                asp-route-storeId="@Model.Store.Id"
+                asp-route-storeId="@Model.StoreId"
                 target="_blank"
                 id="PublicNodeInfo"
                 text-translate="true">
diff --git a/BTCPayServer/Components/StoreLightningServices/StoreLightningServices.cs b/BTCPayServer/Components/StoreLightningServices/StoreLightningServices.cs
index 613079a2e..b3247663c 100644
--- a/BTCPayServer/Components/StoreLightningServices/StoreLightningServices.cs
+++ b/BTCPayServer/Components/StoreLightningServices/StoreLightningServices.cs
@@ -2,15 +2,16 @@ using System;
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Extensions;
+using BTCPayServer.Client;
 using BTCPayServer.Configuration;
 using BTCPayServer.Data;
-using BTCPayServer.Lightning;
 using BTCPayServer.Models;
 using BTCPayServer.Models.StoreViewModels;
 using BTCPayServer.Payments;
 using BTCPayServer.Payments.Lightning;
-using BTCPayServer.Services;
-using BTCPayServer.Services.Stores;
+using BTCPayServer.Security;
+using BTCPayServer.Services.Invoices;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 
@@ -20,24 +21,38 @@ public class StoreLightningServices : ViewComponent
 {
     private readonly BTCPayServerOptions _btcpayServerOptions;
     private readonly BTCPayNetworkProvider _networkProvider;
+    private readonly IAuthorizationService _authorizationService;
+    private readonly PaymentMethodHandlerDictionary _handlers;
+    private readonly IOptions<LightningNetworkOptions> _lightningNetworkOptions;
     private readonly IOptions<ExternalServicesOptions> _externalServiceOptions;
 
     public StoreLightningServices(
         BTCPayNetworkProvider networkProvider,
         BTCPayServerOptions btcpayServerOptions,
+        IAuthorizationService authorizationService,
+        PaymentMethodHandlerDictionary handlers,
+        IOptions<LightningNetworkOptions> lightningNetworkOptions,
         IOptions<ExternalServicesOptions> externalServiceOptions)
     {
         _networkProvider = networkProvider;
         _btcpayServerOptions = btcpayServerOptions;
+        _lightningNetworkOptions = lightningNetworkOptions;
         _externalServiceOptions = externalServiceOptions;
+        _authorizationService = authorizationService;
+        _handlers = handlers;
     }
 
-    public IViewComponentResult Invoke(StoreLightningServicesViewModel vm)
+    public async Task<IViewComponentResult> InvokeAsync(StoreData store, string cryptoCode)
     {
-        if (vm.Store == null)
-            throw new ArgumentNullException(nameof(vm.Store));
-        if (vm.CryptoCode == null)
-            throw new ArgumentNullException(nameof(vm.CryptoCode));
+        var vm = new StoreLightningServicesViewModel { StoreId = store.Id, CryptoCode = cryptoCode };
+        var id = PaymentTypes.LN.GetPaymentMethodId(cryptoCode);
+        var existing = store.GetPaymentMethodConfig<LightningPaymentMethodConfig>(id, _handlers);
+        if (existing?.IsInternalNode is true && _lightningNetworkOptions.Value.InternalLightningByCryptoCode.TryGetValue(cryptoCode, out _))
+        {
+            var result = await _authorizationService.AuthorizeAsync(HttpContext.User, null, new PolicyRequirement(Policies.CanUseInternalLightningNode));
+            vm.LightningNodeType = result.Succeeded ? LightningNodeType.Internal : null;
+        }
+
         if (vm.LightningNodeType != LightningNodeType.Internal)
             return View(vm);
         if (!User.IsInRole(Roles.ServerAdmin))
diff --git a/BTCPayServer/Components/StoreLightningServices/StoreLightningServicesViewModel.cs b/BTCPayServer/Components/StoreLightningServices/StoreLightningServicesViewModel.cs
index 8a1a9b816..33dd3681f 100644
--- a/BTCPayServer/Components/StoreLightningServices/StoreLightningServicesViewModel.cs
+++ b/BTCPayServer/Components/StoreLightningServices/StoreLightningServicesViewModel.cs
@@ -8,8 +8,8 @@ namespace BTCPayServer.Components.StoreLightningServices;
 
 public class StoreLightningServicesViewModel
 {
+    public string StoreId { get; set; }
     public string CryptoCode { get; set; }
-    public StoreData Store { get; set; }
-    public LightningNodeType LightningNodeType { get; set; }
+    public LightningNodeType? LightningNodeType { get; set; }
     public List<AdditionalServiceViewModel> Services { get; set; }
 }
diff --git a/BTCPayServer/Components/StoreNumbers/Default.cshtml b/BTCPayServer/Components/StoreNumbers/Default.cshtml
index 1b3f26fff..b9517b47d 100644
--- a/BTCPayServer/Components/StoreNumbers/Default.cshtml
+++ b/BTCPayServer/Components/StoreNumbers/Default.cshtml
@@ -1,7 +1,7 @@
 @using BTCPayServer.Client
 @model BTCPayServer.Components.StoreNumbers.StoreNumbersViewModel
 
-<div class="widget store-numbers" id="StoreNumbers-@Model.Store.Id">
+<div class="widget store-numbers" id="StoreNumbers-@Model.StoreId">
     @if (Model.InitialRendering)
     {
         <div class="loading d-flex justify-content-center p-3">
@@ -11,8 +11,8 @@
         </div>
         <script>
             (async () => {
-                const url = @Safe.Json(Url.Action("StoreNumbers", "UIStores", new { storeId = Model.Store.Id, cryptoCode = Model.CryptoCode }));
-                const storeId = @Safe.Json(Model.Store.Id);
+                const url = @Safe.Json(Url.Action("StoreNumbers", "UIStores", new { storeId = Model.StoreId, cryptoCode = Model.CryptoCode }));
+                const storeId = @Safe.Json(Model.StoreId);
                 const response = await fetch(url);
                 if (response.ok) {
                     document.getElementById(`StoreNumbers-${storeId}`).outerHTML = await response.text();
@@ -24,10 +24,10 @@
     {
         <div class="store-number">
             <header>
-                <h6 text-translate="true">@ViewLocalizer["Paid invoices in the last {0} days", @Model.TimeframeDays]</h6>
+                <h6 text-translate="true">@ViewLocalizer["Paid invoices in the last {0} days", Model.TimeframeDays]</h6>
                 @if (Model.PaidInvoices > 0)
                 {
-                    <a asp-controller="UIInvoice" asp-action="ListInvoices" asp-route-storeId="@Model.Store.Id"  permission="@Policies.CanViewInvoices">View All</a>
+                    <a asp-controller="UIInvoice" asp-action="ListInvoices" asp-route-storeId="@Model.StoreId"  permission="@Policies.CanViewInvoices" text-translate="true">View All</a>
                 }
             </header>
             <div class="h3">@Model.PaidInvoices</div>
@@ -35,7 +35,7 @@
         <div class="store-number">
             <header>
                 <h6 text-translate="true">Payouts Pending</h6>
-                <a asp-controller="UIStorePullPayments" asp-action="Payouts" asp-route-storeId="@Model.Store.Id" permission="@Policies.CanManagePullPayments" text-translate="true">Manage</a>
+                <a asp-controller="UIStorePullPayments" asp-action="Payouts" asp-route-storeId="@Model.StoreId" permission="@Policies.CanManagePullPayments" text-translate="true">Manage</a>
             </header>
             <div class="h3">@Model.PayoutsPending</div>
         </div>
diff --git a/BTCPayServer/Components/StoreNumbers/StoreNumbers.cs b/BTCPayServer/Components/StoreNumbers/StoreNumbers.cs
index 5bf35bf27..cd1c174db 100644
--- a/BTCPayServer/Components/StoreNumbers/StoreNumbers.cs
+++ b/BTCPayServer/Components/StoreNumbers/StoreNumbers.cs
@@ -1,19 +1,12 @@
 using System;
-using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
-using BTCPayServer.Components.StoreRecentTransactions;
 using BTCPayServer.Data;
-using BTCPayServer.Services;
 using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Stores;
-using BTCPayServer.Services.Wallets;
-using Dapper;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Npgsql;
 using StoreData = BTCPayServer.Data.StoreData;
 
 namespace BTCPayServer.Components.StoreNumbers;
@@ -34,14 +27,15 @@ public class StoreNumbers : ViewComponent
         _invoiceRepository = invoiceRepository;
     }
 
-    public async Task<IViewComponentResult> InvokeAsync(StoreNumbersViewModel vm)
+    public async Task<IViewComponentResult> InvokeAsync(StoreData store, string cryptoCode, bool initialRendering)
     {
-        if (vm.Store == null)
-            throw new ArgumentNullException(nameof(vm.Store));
-        if (vm.CryptoCode == null)
-            throw new ArgumentNullException(nameof(vm.CryptoCode));
-
-        vm.WalletId = new WalletId(vm.Store.Id, vm.CryptoCode);
+        var vm = new StoreNumbersViewModel
+        {
+            StoreId = store.Id,
+            CryptoCode = cryptoCode,
+            InitialRendering = initialRendering,
+            WalletId = new WalletId(store.Id, cryptoCode)
+        };
 
         if (vm.InitialRendering)
             return View(vm);
@@ -50,12 +44,12 @@ public class StoreNumbers : ViewComponent
         var offset = DateTimeOffset.Now.AddDays(-vm.TimeframeDays).ToUniversalTime();
         
         vm.PaidInvoices = await _invoiceRepository.GetInvoiceCount(
-            new InvoiceQuery { StoreId = new [] { vm.Store.Id }, StartDate = offset, Status = new [] { "paid", "confirmed" } });
+            new InvoiceQuery { StoreId = [store.Id], StartDate = offset, Status = ["paid", "confirmed"] });
         vm.PayoutsPending = await ctx.Payouts
-            .Where(p => p.PullPaymentData.StoreId == vm.Store.Id && !p.PullPaymentData.Archived && p.State == PayoutState.AwaitingApproval)
+            .Where(p => p.PullPaymentData.StoreId == store.Id && !p.PullPaymentData.Archived && p.State == PayoutState.AwaitingApproval)
             .CountAsync();
         vm.RefundsIssued = await ctx.Invoices
-            .Where(i => i.StoreData.Id == vm.Store.Id && !i.Archived && i.Created >= offset)
+            .Where(i => i.StoreData.Id == store.Id && !i.Archived && i.Created >= offset)
             .SelectMany(i => i.Refunds)
             .CountAsync();
 
diff --git a/BTCPayServer/Components/StoreNumbers/StoreNumbersViewModel.cs b/BTCPayServer/Components/StoreNumbers/StoreNumbersViewModel.cs
index 55ba51bd6..6d08e90da 100644
--- a/BTCPayServer/Components/StoreNumbers/StoreNumbersViewModel.cs
+++ b/BTCPayServer/Components/StoreNumbers/StoreNumbersViewModel.cs
@@ -1,10 +1,8 @@
-using BTCPayServer.Data;
-
 namespace BTCPayServer.Components.StoreNumbers;
 
 public class StoreNumbersViewModel
 {
-    public StoreData Store { get; set; }
+    public string StoreId { get; set; }
     public WalletId WalletId { get; set; }
     public int PayoutsPending { get; set; }
     public int TimeframeDays { get; set; } = 7;
diff --git a/BTCPayServer/Components/StoreRecentInvoices/Default.cshtml b/BTCPayServer/Components/StoreRecentInvoices/Default.cshtml
index fed940a93..46ba89a90 100644
--- a/BTCPayServer/Components/StoreRecentInvoices/Default.cshtml
+++ b/BTCPayServer/Components/StoreRecentInvoices/Default.cshtml
@@ -1,15 +1,14 @@
 @using BTCPayServer.Client.Models
 @using BTCPayServer.Services
-@using BTCPayServer.Services.Invoices
 @inject DisplayFormatter DisplayFormatter
 @model BTCPayServer.Components.StoreRecentInvoices.StoreRecentInvoicesViewModel
 
-<div class="widget store-recent-invoices" id="StoreRecentInvoices-@Model.Store.Id">
+<div class="widget store-recent-invoices" id="StoreRecentInvoices-@Model.StoreId">
     <header>
         <h3 text-translate="true">Recent Invoices</h3>
         @if (Model.Invoices.Any())
         {
-            <a asp-controller="UIInvoice" asp-action="ListInvoices" asp-route-storeId="@Model.Store.Id" text-translate="true">View All</a>
+            <a asp-controller="UIInvoice" asp-action="ListInvoices" asp-route-storeId="@Model.StoreId" text-translate="true">View All</a>
         }
     </header>
     @if (Model.InitialRendering)
@@ -21,8 +20,8 @@
         </div>
         <script>
             (async () => {
-                const url = @Safe.Json(Url.Action("RecentInvoices", "UIStores", new { storeId = Model.Store.Id, cryptoCode = Model.CryptoCode }));
-                const storeId = @Safe.Json(Model.Store.Id);
+                const url = @Safe.Json(Url.Action("RecentInvoices", "UIStores", new { storeId = Model.StoreId, cryptoCode = Model.CryptoCode }));
+                const storeId = @Safe.Json(Model.StoreId);
                 const response = await fetch(url);
                 if (response.ok) {
                     document.getElementById(`StoreRecentInvoices-${storeId}`).outerHTML = await response.text();
@@ -68,7 +67,7 @@
         <p class="text-secondary my-3" text-translate="true">
             There are no recent invoices.
         </p>
-        <a asp-controller="UIInvoice" asp-action="CreateInvoice" asp-route-storeId="@Model.Store.Id" class="fw-semibold" text-translate="true">
+        <a asp-controller="UIInvoice" asp-action="CreateInvoice" asp-route-storeId="@Model.StoreId" class="fw-semibold" text-translate="true">
             Create Invoice
         </a>
     }
diff --git a/BTCPayServer/Components/StoreRecentInvoices/StoreRecentInvoices.cs b/BTCPayServer/Components/StoreRecentInvoices/StoreRecentInvoices.cs
index c90e4fa61..6d01c23e7 100644
--- a/BTCPayServer/Components/StoreRecentInvoices/StoreRecentInvoices.cs
+++ b/BTCPayServer/Components/StoreRecentInvoices/StoreRecentInvoices.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Data;
@@ -9,7 +7,6 @@ using BTCPayServer.Services.Rates;
 using BTCPayServer.Services.Stores;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using NBitcoin;
 
 namespace BTCPayServer.Components.StoreRecentInvoices;
 
@@ -35,12 +32,15 @@ public class StoreRecentInvoices : ViewComponent
         _dbContextFactory = dbContextFactory;
     }
 
-    public async Task<IViewComponentResult> InvokeAsync(StoreRecentInvoicesViewModel vm)
+    public async Task<IViewComponentResult> InvokeAsync(StoreData store, string cryptoCode, bool initialRendering)
     {
-        if (vm.Store == null)
-            throw new ArgumentNullException(nameof(vm.Store));
-        if (vm.CryptoCode == null)
-            throw new ArgumentNullException(nameof(vm.CryptoCode));
+        var vm = new StoreRecentInvoicesViewModel
+        {
+            StoreId = store.Id,
+            CryptoCode = cryptoCode,
+            InitialRendering = initialRendering
+        };
+
         if (vm.InitialRendering)
             return View(vm);
 
@@ -48,7 +48,7 @@ public class StoreRecentInvoices : ViewComponent
         var invoiceEntities = await _invoiceRepo.GetInvoices(new InvoiceQuery
         {
             UserId = userId,
-            StoreId = new[] { vm.Store.Id },
+            StoreId = [store.Id],
             IncludeArchived = false,
             IncludeRefunds = true,
             Take = 5
diff --git a/BTCPayServer/Components/StoreRecentInvoices/StoreRecentInvoicesViewModel.cs b/BTCPayServer/Components/StoreRecentInvoices/StoreRecentInvoicesViewModel.cs
index 339ca997c..b129bfb85 100644
--- a/BTCPayServer/Components/StoreRecentInvoices/StoreRecentInvoicesViewModel.cs
+++ b/BTCPayServer/Components/StoreRecentInvoices/StoreRecentInvoicesViewModel.cs
@@ -5,7 +5,7 @@ namespace BTCPayServer.Components.StoreRecentInvoices;
 
 public class StoreRecentInvoicesViewModel
 {
-    public StoreData Store { get; set; }
+    public string StoreId { get; set; }
     public IList<StoreRecentInvoiceViewModel> Invoices { get; set; } = new List<StoreRecentInvoiceViewModel>();
     public bool InitialRendering { get; set; }
     public string CryptoCode { get; set; }
diff --git a/BTCPayServer/Components/StoreRecentTransactions/Default.cshtml b/BTCPayServer/Components/StoreRecentTransactions/Default.cshtml
index 4a48f0c0e..0da1033e7 100644
--- a/BTCPayServer/Components/StoreRecentTransactions/Default.cshtml
+++ b/BTCPayServer/Components/StoreRecentTransactions/Default.cshtml
@@ -2,7 +2,7 @@
 @inject DisplayFormatter DisplayFormatter
 @model BTCPayServer.Components.StoreRecentTransactions.StoreRecentTransactionsViewModel
 
-<div class="widget store-recent-transactions" id="StoreRecentTransactions-@Model.Store.Id">
+<div class="widget store-recent-transactions" id="StoreRecentTransactions-@Model.StoreId">
     <header>
         <h3 text-translate="true">Recent Transactions</h3>
         @if (Model.Transactions.Any())
@@ -19,8 +19,8 @@
         </div>
         <script>
             (async () => {
-                const url = @Safe.Json(Url.Action("RecentTransactions", "UIStores", new { storeId = Model.Store.Id, cryptoCode = Model.CryptoCode }));
-                const storeId = @Safe.Json(Model.Store.Id);
+                const url = @Safe.Json(Url.Action("RecentTransactions", "UIStores", new { storeId = Model.StoreId, cryptoCode = Model.CryptoCode }));
+                const storeId = @Safe.Json(Model.StoreId);
                 const response = await fetch(url);
                 if (response.ok) {
                     document.getElementById(`StoreRecentTransactions-${storeId}`).outerHTML = await response.text();
diff --git a/BTCPayServer/Components/StoreRecentTransactions/StoreRecentTransactions.cs b/BTCPayServer/Components/StoreRecentTransactions/StoreRecentTransactions.cs
index e202832d2..ad0e5d083 100644
--- a/BTCPayServer/Components/StoreRecentTransactions/StoreRecentTransactions.cs
+++ b/BTCPayServer/Components/StoreRecentTransactions/StoreRecentTransactions.cs
@@ -1,27 +1,16 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
-using BTCPayServer.Abstractions.Extensions;
 using BTCPayServer.Data;
-using BTCPayServer.Models.StoreViewModels;
 using BTCPayServer.Payments;
 using BTCPayServer.Payments.Bitcoin;
 using BTCPayServer.Services;
 using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Labels;
-using BTCPayServer.Services.Stores;
 using BTCPayServer.Services.Wallets;
-using Dapper;
-using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using NBitcoin;
-using NBXplorer;
-using NBXplorer.Client;
-using static BTCPayServer.Components.StoreRecentTransactions.StoreRecentTransactionsViewModel;
 
 namespace BTCPayServer.Components.StoreRecentTransactions;
 
@@ -47,26 +36,27 @@ public class StoreRecentTransactions : ViewComponent
         _transactionLinkProviders = transactionLinkProviders;
     }
 
-    public async Task<IViewComponentResult> InvokeAsync(StoreRecentTransactionsViewModel vm)
+    public async Task<IViewComponentResult> InvokeAsync(StoreData store, string cryptoCode, bool initialRendering)
     {
-        if (vm.Store == null)
-            throw new ArgumentNullException(nameof(vm.Store));
-        if (vm.CryptoCode == null)
-            throw new ArgumentNullException(nameof(vm.CryptoCode));
-
-        vm.WalletId = new WalletId(vm.Store.Id, vm.CryptoCode);
+        var vm = new StoreRecentTransactionsViewModel
+        {
+            StoreId = store.Id,
+            CryptoCode = cryptoCode,
+            InitialRendering = initialRendering,
+            WalletId = new WalletId(store.Id, cryptoCode)
+        };
 
         if (vm.InitialRendering)
             return View(vm);
 
-        var derivationSettings = vm.Store.GetDerivationSchemeSettings(_handlers, vm.CryptoCode);
+        var derivationSettings = store.GetDerivationSchemeSettings(_handlers, vm.CryptoCode);
         var transactions = new List<StoreRecentTransactionViewModel>();
         if (derivationSettings?.AccountDerivation is not null)
         {
             var pmi = PaymentTypes.CHAIN.GetPaymentMethodId(vm.CryptoCode);
             var network = ((IHasNetwork)_handlers[pmi]).Network;
             var wallet = _walletProvider.GetWallet(network);
-            var allTransactions = await wallet.FetchTransactionHistory(derivationSettings.AccountDerivation, 0, 5, TimeSpan.FromDays(31.0), cancellationToken: this.HttpContext.RequestAborted);
+            var allTransactions = await wallet.FetchTransactionHistory(derivationSettings.AccountDerivation, 0, 5, TimeSpan.FromDays(31.0), cancellationToken: HttpContext.RequestAborted);
             var walletTransactionsInfo = await _walletRepository.GetWalletTransactionsInfo(vm.WalletId, allTransactions.Select(t => t.TransactionId.ToString()).ToArray());
             
             transactions = allTransactions
diff --git a/BTCPayServer/Components/StoreRecentTransactions/StoreRecentTransactionsViewModel.cs b/BTCPayServer/Components/StoreRecentTransactions/StoreRecentTransactionsViewModel.cs
index d8e1dbcd6..708d0fbbc 100644
--- a/BTCPayServer/Components/StoreRecentTransactions/StoreRecentTransactionsViewModel.cs
+++ b/BTCPayServer/Components/StoreRecentTransactions/StoreRecentTransactionsViewModel.cs
@@ -1,11 +1,10 @@
 using System.Collections.Generic;
-using BTCPayServer.Data;
 
 namespace BTCPayServer.Components.StoreRecentTransactions;
 
 public class StoreRecentTransactionsViewModel
 {
-    public StoreData Store { get; set; }
+    public string StoreId { get; set; }
     public IList<StoreRecentTransactionViewModel> Transactions { get; set; } = new List<StoreRecentTransactionViewModel>();
     public WalletId WalletId { get; set; }
     public bool InitialRendering { get; set; }
diff --git a/BTCPayServer/Components/StoreSelector/StoreSelector.cs b/BTCPayServer/Components/StoreSelector/StoreSelector.cs
index 710e1895f..9827ce7cd 100644
--- a/BTCPayServer/Components/StoreSelector/StoreSelector.cs
+++ b/BTCPayServer/Components/StoreSelector/StoreSelector.cs
@@ -1,16 +1,11 @@
 using System.Linq;
 using System.Threading.Tasks;
-using BTCPayServer.Abstractions.Contracts;
 using BTCPayServer.Abstractions.Extensions;
-using BTCPayServer.Client;
 using BTCPayServer.Data;
-using BTCPayServer.Payments.Bitcoin;
 using BTCPayServer.Services;
-using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Stores;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Rendering;
 
 namespace BTCPayServer.Components.StoreSelector
 {
@@ -38,13 +33,11 @@ namespace BTCPayServer.Components.StoreSelector
             var archivedCount = stores.Count(s => s.Archived);
             var options = stores
                 .Where(store => !store.Archived)
-                .Select(store =>
-                new StoreSelectorOption
+                .Select(store => new StoreSelectorOption
                 {
                     Text = store.StoreName,
                     Value = store.Id,
-                    Selected = store.Id == currentStore?.Id,
-                    Store = store
+                    Selected = store.Id == currentStore?.Id
                 })
                 .OrderBy(s => s.Text)
                 .ToList();
diff --git a/BTCPayServer/Components/StoreSelector/StoreSelectorViewModel.cs b/BTCPayServer/Components/StoreSelector/StoreSelectorViewModel.cs
index 0383514ae..584af1075 100644
--- a/BTCPayServer/Components/StoreSelector/StoreSelectorViewModel.cs
+++ b/BTCPayServer/Components/StoreSelector/StoreSelectorViewModel.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using BTCPayServer.Data;
 
 namespace BTCPayServer.Components.StoreSelector
 {
@@ -17,6 +16,5 @@ namespace BTCPayServer.Components.StoreSelector
         public bool Selected { get; set; }
         public string Text { get; set; }
         public string Value { get; set; }
-        public StoreData Store { get; set; }
     }
 }
diff --git a/BTCPayServer/Components/StoreWalletBalance/StoreWalletBalanceViewModel.cs b/BTCPayServer/Components/StoreWalletBalance/StoreWalletBalanceViewModel.cs
index b5426ab60..07d6f5b41 100644
--- a/BTCPayServer/Components/StoreWalletBalance/StoreWalletBalanceViewModel.cs
+++ b/BTCPayServer/Components/StoreWalletBalance/StoreWalletBalanceViewModel.cs
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using BTCPayServer.Client.Models;
 using BTCPayServer.Services.Rates;
-using StoreData = BTCPayServer.Data.StoreData;
 
 namespace BTCPayServer.Components.StoreWalletBalance;
 
diff --git a/BTCPayServer/Controllers/UINotificationsController.cs b/BTCPayServer/Controllers/UINotificationsController.cs
index 339e2ef82..7149c7fbe 100644
--- a/BTCPayServer/Controllers/UINotificationsController.cs
+++ b/BTCPayServer/Controllers/UINotificationsController.cs
@@ -43,11 +43,21 @@ namespace BTCPayServer.Controllers
             if (!ValidUserClaim(out var userId))
                 return RedirectToAction("Index", "UIHome");
 
-            var stores = await _storeRepo.GetStoresByUserId(userId);
-            model.Stores = stores.Where(store => !store.Archived).OrderBy(s => s.StoreName).ToList();
-
             var searchTerm = string.IsNullOrEmpty(model.SearchText) ? model.SearchTerm : $"{model.SearchText},{model.SearchTerm}";
             var fs = new SearchString(searchTerm, timezoneOffset);
+            var storeIds = fs.GetFilterArray("storeid");
+            var stores = await _storeRepo.GetStoresByUserId(userId);
+            model.StoreFilterOptions = stores
+                .Where(store => !store.Archived)
+                .OrderBy(s => s.StoreName)
+                .Select(s => new StoreFilterOption
+                {
+                    Selected = storeIds?.Contains(s.Id) is true,
+                    Text = s.StoreName,
+                    Value = s.Id
+                })
+                .ToList();
+
             model.Search = fs;
 
             var res = await _notificationManager.GetNotifications(new NotificationsQuery
@@ -57,7 +67,7 @@ namespace BTCPayServer.Controllers
                 UserId = userId,
                 SearchText = model.SearchText,
                 Type = fs.GetFilterArray("type"),
-                StoreIds = fs.GetFilterArray("storeid"),
+                StoreIds = storeIds,
                 Seen = model.Status == "Unread" ? false : null
             });
             model.Items = res.Items;
diff --git a/BTCPayServer/Controllers/UIStoresController.Dashboard.cs b/BTCPayServer/Controllers/UIStoresController.Dashboard.cs
index f8c1124f4..32ec77dfc 100644
--- a/BTCPayServer/Controllers/UIStoresController.Dashboard.cs
+++ b/BTCPayServer/Controllers/UIStoresController.Dashboard.cs
@@ -6,10 +6,6 @@ using System.Text;
 using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Constants;
 using BTCPayServer.Client;
-using BTCPayServer.Components.StoreLightningBalance;
-using BTCPayServer.Components.StoreNumbers;
-using BTCPayServer.Components.StoreRecentInvoices;
-using BTCPayServer.Components.StoreRecentTransactions;
 using BTCPayServer.Data;
 using BTCPayServer.Models.StoreViewModels;
 using BTCPayServer.Payments.Bitcoin;
@@ -74,10 +70,9 @@ public partial class UIStoresController
     public IActionResult LightningBalance(string storeId, string cryptoCode)
     {
         var store = HttpContext.GetStoreData();
-        if (store == null)
-            return NotFound();
-
-        return ViewComponent("StoreLightningBalance", new { Store = store, CryptoCode = cryptoCode });
+        return store != null
+             ? ViewComponent("StoreLightningBalance", new { Store = store, CryptoCode = cryptoCode })
+             : NotFound();
     }
 
     [HttpGet("{storeId}/dashboard/{cryptoCode}/numbers")]
@@ -85,11 +80,9 @@ public partial class UIStoresController
     public IActionResult StoreNumbers(string storeId, string cryptoCode)
     {
         var store = HttpContext.GetStoreData();
-        if (store == null)
-            return NotFound();
-
-        var vm = new StoreNumbersViewModel { Store = store, CryptoCode = cryptoCode };
-        return ViewComponent("StoreNumbers", new { vm });
+        return store != null
+            ? ViewComponent("StoreNumbers", new { Store = store, CryptoCode = cryptoCode })
+            : NotFound();
     }
 
     [HttpGet("{storeId}/dashboard/{cryptoCode}/recent-transactions")]
@@ -97,11 +90,9 @@ public partial class UIStoresController
     public IActionResult RecentTransactions(string storeId, string cryptoCode)
     {
         var store = HttpContext.GetStoreData();
-        if (store == null)
-            return NotFound();
-
-        var vm = new StoreRecentTransactionsViewModel { Store = store, CryptoCode = cryptoCode };
-        return ViewComponent("StoreRecentTransactions", new { vm });
+        return store != null
+            ? ViewComponent("StoreRecentTransactions", new { Store = store, CryptoCode = cryptoCode })
+            : NotFound();
     }
 
     [HttpGet("{storeId}/dashboard/{cryptoCode}/recent-invoices")]
@@ -109,11 +100,9 @@ public partial class UIStoresController
     public IActionResult RecentInvoices(string storeId, string cryptoCode)
     {
         var store = HttpContext.GetStoreData();
-        if (store == null)
-            return NotFound();
-
-        var vm = new StoreRecentInvoicesViewModel { Store = store, CryptoCode = cryptoCode };
-        return ViewComponent("StoreRecentInvoices", new { vm });
+        return store != null
+            ? ViewComponent("StoreRecentInvoices", new { Store = store, CryptoCode = cryptoCode })
+            : NotFound();
     }
 
     internal void AddPaymentMethods(StoreData store, StoreBlob storeBlob,
diff --git a/BTCPayServer/Models/NotificationViewModels/IndexViewModel.cs b/BTCPayServer/Models/NotificationViewModels/IndexViewModel.cs
index 6365e0596..8b007e8e0 100644
--- a/BTCPayServer/Models/NotificationViewModels/IndexViewModel.cs
+++ b/BTCPayServer/Models/NotificationViewModels/IndexViewModel.cs
@@ -15,6 +15,13 @@ namespace BTCPayServer.Models.NotificationViewModels
 
     public class NotificationIndexViewModel : IndexViewModel
     {
-        public List<StoreData> Stores { get; set; }
+        public List<StoreFilterOption> StoreFilterOptions { get; set; }
+    }
+
+    public class StoreFilterOption
+    {
+        public bool Selected { get; set; }
+        public string Text { get; set; }
+        public string Value { get; set; }
     }
 }
diff --git a/BTCPayServer/Views/UINotifications/Index.cshtml b/BTCPayServer/Views/UINotifications/Index.cshtml
index 4e6016541..16d7eaa20 100644
--- a/BTCPayServer/Views/UINotifications/Index.cshtml
+++ b/BTCPayServer/Views/UINotifications/Index.cshtml
@@ -96,14 +96,14 @@
             }
         </button>
         <div class="dropdown-menu" aria-labelledby="StoresOptionsToggle">
-            @foreach (var store in Model.Stores)
+            @foreach (var store in Model.StoreFilterOptions)
             {
                 <a asp-action="Index"
                    asp-route-count="@Model.Count"
                    asp-route-status="@Model.Status"
-                   asp-route-searchTerm="@Model.Search.Toggle("storeid", store.Id)"
-                   class="dropdown-item @(HasArrayFilter("storeid", store.Id) ? "custom-active" : "")">
-                    @store.StoreName
+                   asp-route-searchTerm="@Model.Search.Toggle("storeid", store.Value)"
+                   class="dropdown-item @(store.Selected ? "custom-active" : "")">
+                    @store.Text
                 </a>
             }
         </div>
diff --git a/BTCPayServer/Views/UIStores/Dashboard.cshtml b/BTCPayServer/Views/UIStores/Dashboard.cshtml
index a0cf4b556..5ac3dc2a5 100644
--- a/BTCPayServer/Views/UIStores/Dashboard.cshtml
+++ b/BTCPayServer/Views/UIStores/Dashboard.cshtml
@@ -78,17 +78,17 @@
                 </div>
             </div>
         }
-        <vc:store-numbers vm="@(new StoreNumbersViewModel { Store = store, CryptoCode = Model.CryptoCode, InitialRendering = true })" />
+        <vc:store-numbers store="store" crypto-code="@Model.CryptoCode" initial-rendering="true" />
         @if (Model.LightningEnabled)
         {
             <vc:store-lightning-balance store="store" crypto-code="@Model.CryptoCode" initial-rendering="true" />
-            <vc:store-lightning-services vm="@(new StoreLightningServicesViewModel { Store = store, CryptoCode = Model.CryptoCode })" permission="@Policies.CanModifyServerSettings" />
+            <vc:store-lightning-services store="store" crypto-code="@Model.CryptoCode" permission="@Policies.CanModifyServerSettings" />
         }
         @if (Model.WalletEnabled)
         {
-            <vc:store-recent-transactions vm="@(new StoreRecentTransactionsViewModel { Store = store, CryptoCode = Model.CryptoCode, InitialRendering = true })" />
+            <vc:store-recent-transactions store="store" crypto-code="@Model.CryptoCode" initial-rendering="true" />
         }
-        <vc:store-recent-invoices vm="@(new StoreRecentInvoicesViewModel { Store = store, CryptoCode = Model.CryptoCode, InitialRendering = true })" />
+        <vc:store-recent-invoices store="store" crypto-code="@Model.CryptoCode" initial-rendering="true" />
         @foreach (var app in Model.Apps)
         {
             <vc:app-sales app-id="@app.Id" app-type="@app.AppType" />
diff --git a/BTCPayServer/Views/UIStores/SetupLightningNode.cshtml b/BTCPayServer/Views/UIStores/SetupLightningNode.cshtml
index a41e0b4d9..33d3bd97c 100644
--- a/BTCPayServer/Views/UIStores/SetupLightningNode.cshtml
+++ b/BTCPayServer/Views/UIStores/SetupLightningNode.cshtml
@@ -1,7 +1,7 @@
 @model LightningNodeViewModel
 @{
     Layout = "_LayoutWalletSetup.cshtml";
-    ViewData.SetActivePage(StoreNavPages.LightningSettings, StringLocalizer["Connect to a Lightning node"], Context.GetStoreData().Id);
+    ViewData.SetActivePage(StoreNavPages.LightningSettings, StringLocalizer["Connect to a Lightning node"], Model.StoreId);
 }
 
 @section PageHeadContent {
diff --git a/BTCPayServer/Views/UIStores/StoreUsers.cshtml b/BTCPayServer/Views/UIStores/StoreUsers.cshtml
index 6437e41b7..39c8b8052 100644
--- a/BTCPayServer/Views/UIStores/StoreUsers.cshtml
+++ b/BTCPayServer/Views/UIStores/StoreUsers.cshtml
@@ -5,7 +5,7 @@
 @model StoreUsersViewModel
 @inject StoreRepository StoreRepository
 @{
-    var storeId = Context.GetStoreData().Id;
+    var storeId = Model.StoreId;
     var roles = new SelectList(
         await StoreRepository.GetStoreRoles(storeId),
         nameof(StoreRepository.StoreRole.Id), nameof(StoreRepository.StoreRole.Role),