diff --git a/htlcswitch/interfaces.go b/htlcswitch/interfaces.go
index b3f88003..04ea148c 100644
--- a/htlcswitch/interfaces.go
+++ b/htlcswitch/interfaces.go
@@ -12,7 +12,7 @@ import (
 type InvoiceDatabase interface {
 	// LookupInvoice attempts to look up an invoice according to it's 32
 	// byte payment hash.
-	LookupInvoice(chainhash.Hash) (*channeldb.Invoice, error)
+	LookupInvoice(chainhash.Hash) (channeldb.Invoice, error)
 
 	// SettleInvoice attempts to mark an invoice corresponding to the
 	// passed payment hash as fully settled.
diff --git a/htlcswitch/link_test.go b/htlcswitch/link_test.go
index e98656ac..06306b28 100644
--- a/htlcswitch/link_test.go
+++ b/htlcswitch/link_test.go
@@ -978,7 +978,7 @@ func TestChannelLinkMultiHopUnknownPaymentHash(t *testing.T) {
 	invoice.Terms.PaymentPreimage[0] ^= byte(255)
 
 	// Check who is last in the route and add invoice to server registry.
-	if err := n.carolServer.registry.AddInvoice(invoice); err != nil {
+	if err := n.carolServer.registry.AddInvoice(*invoice); err != nil {
 		t.Fatalf("unable to add invoice in carol registry: %v", err)
 	}
 
@@ -1955,7 +1955,7 @@ func TestChannelRetransmission(t *testing.T) {
 		// TODO(andrew.shvv) Will be removed if we move the notification center
 		// to the channel link itself.
 
-		var invoice *channeldb.Invoice
+		var invoice channeldb.Invoice
 		for i := 0; i < 20; i++ {
 			select {
 			case <-time.After(time.Millisecond * 200):
diff --git a/htlcswitch/mock.go b/htlcswitch/mock.go
index a8508f7b..d65f8e39 100644
--- a/htlcswitch/mock.go
+++ b/htlcswitch/mock.go
@@ -397,22 +397,22 @@ var _ ChannelLink = (*mockChannelLink)(nil)
 
 type mockInvoiceRegistry struct {
 	sync.Mutex
-	invoices map[chainhash.Hash]*channeldb.Invoice
+	invoices map[chainhash.Hash]channeldb.Invoice
 }
 
 func newMockRegistry() *mockInvoiceRegistry {
 	return &mockInvoiceRegistry{
-		invoices: make(map[chainhash.Hash]*channeldb.Invoice),
+		invoices: make(map[chainhash.Hash]channeldb.Invoice),
 	}
 }
 
-func (i *mockInvoiceRegistry) LookupInvoice(rHash chainhash.Hash) (*channeldb.Invoice, error) {
+func (i *mockInvoiceRegistry) LookupInvoice(rHash chainhash.Hash) (channeldb.Invoice, error) {
 	i.Lock()
 	defer i.Unlock()
 
 	invoice, ok := i.invoices[rHash]
 	if !ok {
-		return nil, errors.New("can't find mock invoice")
+		return channeldb.Invoice{}, errors.New("can't find mock invoice")
 	}
 
 	return invoice, nil
@@ -428,11 +428,12 @@ func (i *mockInvoiceRegistry) SettleInvoice(rhash chainhash.Hash) error {
 	}
 
 	invoice.Terms.Settled = true
+	i.invoices[rhash] = invoice
 
 	return nil
 }
 
-func (i *mockInvoiceRegistry) AddInvoice(invoice *channeldb.Invoice) error {
+func (i *mockInvoiceRegistry) AddInvoice(invoice channeldb.Invoice) error {
 	i.Lock()
 	defer i.Unlock()
 
diff --git a/htlcswitch/test_utils.go b/htlcswitch/test_utils.go
index 33ae866d..e700d0ee 100644
--- a/htlcswitch/test_utils.go
+++ b/htlcswitch/test_utils.go
@@ -549,7 +549,7 @@ func (n *threeHopNetwork) makePayment(sendingPeer, receivingPeer Peer,
 	rhash = fastsha256.Sum256(invoice.Terms.PaymentPreimage[:])
 
 	// Check who is last in the route and add invoice to server registry.
-	if err := receiver.registry.AddInvoice(invoice); err != nil {
+	if err := receiver.registry.AddInvoice(*invoice); err != nil {
 		paymentErr <- err
 		return &paymentResponse{
 			rhash: rhash,
diff --git a/invoiceregistry.go b/invoiceregistry.go
index f989993b..58fb0515 100644
--- a/invoiceregistry.go
+++ b/invoiceregistry.go
@@ -98,7 +98,7 @@ func (i *invoiceRegistry) AddInvoice(invoice *channeldb.Invoice) error {
 // lookupInvoice looks up an invoice by its payment hash (R-Hash), if found
 // then we're able to pull the funds pending within an HTLC.
 // TODO(roasbeef): ignore if settled?
-func (i *invoiceRegistry) LookupInvoice(rHash chainhash.Hash) (*channeldb.Invoice, error) {
+func (i *invoiceRegistry) LookupInvoice(rHash chainhash.Hash) (channeldb.Invoice, error) {
 	// First check the in-memory debug invoice index to see if this is an
 	// existing invoice added for debugging.
 	i.RLock()
@@ -107,12 +107,17 @@ func (i *invoiceRegistry) LookupInvoice(rHash chainhash.Hash) (*channeldb.Invoic
 
 	// If found, then simply return the invoice directly.
 	if ok {
-		return invoice, nil
+		return *invoice, nil
 	}
 
 	// Otherwise, we'll check the database to see if there's an existing
 	// matching invoice.
-	return i.cdb.LookupInvoice(rHash)
+	invoice, err := i.cdb.LookupInvoice(rHash)
+	if err != nil {
+		return channeldb.Invoice{}, err
+	}
+
+	return *invoice, nil
 }
 
 // SettleInvoice attempts to mark an invoice as settled. If the invoice is a
diff --git a/lnwallet/channel_test.go b/lnwallet/channel_test.go
index 5cd6271d..e8b7ce7c 100644
--- a/lnwallet/channel_test.go
+++ b/lnwallet/channel_test.go
@@ -3359,7 +3359,10 @@ func TestChanSyncUnableToSync(t *testing.T) {
 	}
 }
 
-// TestChanAvailableBandwidth...
+// TestChanAvailableBandwidth tests the accuracy of the AvailableBalance()
+// method. The value returned from this message should reflect the value
+// returned within the commitment state of a channel after the transition is
+// initiated.
 func TestChanAvailableBandwidth(t *testing.T) {
 	t.Parallel()
 
diff --git a/rpcserver.go b/rpcserver.go
index b279c5dd..445b579d 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -2029,7 +2029,7 @@ func (r *rpcServer) LookupInvoice(ctx context.Context,
 			return spew.Sdump(invoice)
 		}))
 
-	rpcInvoice, err := createRPCInvoice(invoice)
+	rpcInvoice, err := createRPCInvoice(&invoice)
 	if err != nil {
 		return nil, err
 	}