diff --git a/rpcserver.go b/rpcserver.go
index fdfb8ebd6..d55c97257 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -5806,7 +5806,7 @@ func (r *rpcServer) ListInvoices(ctx context.Context,
 		CreationDateEnd:   int64(req.CreationDateEnd),
 	}
 
-	invoiceSlice, err := r.server.miscDB.QueryInvoices(ctx, q)
+	invoiceSlice, err := r.server.invoicesDB.QueryInvoices(ctx, q)
 	if err != nil {
 		return nil, fmt.Errorf("unable to query invoices: %w", err)
 	}
diff --git a/server.go b/server.go
index cb1540a2c..32dbc9cf0 100644
--- a/server.go
+++ b/server.go
@@ -246,6 +246,8 @@ type server struct {
 	// channel DB that haven't been separated out yet.
 	miscDB *channeldb.DB
 
+	invoicesDB invoices.InvoiceDB
+
 	aliasMgr *aliasmgr.Manager
 
 	htlcSwitch *htlcswitch.Switch
@@ -564,6 +566,7 @@ func newServer(cfg *Config, listenAddrs []net.Addr,
 		chanStateDB:    dbs.ChanStateDB.ChannelStateDB(),
 		addrSource:     dbs.ChanStateDB,
 		miscDB:         dbs.ChanStateDB,
+		invoicesDB:     dbs.InvoiceDB,
 		cc:             cc,
 		sigPool:        lnwallet.NewSigPool(cfg.Workers.Sig, cc.Signer),
 		writePool:      writePool,