diff --git a/channeldb/channel.go b/channeldb/channel.go
index f4e99a6f8..6bf20373c 100644
--- a/channeldb/channel.go
+++ b/channeldb/channel.go
@@ -3146,7 +3146,7 @@ func (c *OpenChannel) RemoteCommitChainTip() (*CommitDiff, error) {
 		return nil, err
 	}
 
-	return cd, err
+	return cd, nil
 }
 
 // UnsignedAckedUpdates retrieves the persisted unsigned acked remote log
diff --git a/channeldb/migration32/mission_control_store.go b/channeldb/migration32/mission_control_store.go
index 76463eb6c..060bb2b9c 100644
--- a/channeldb/migration32/mission_control_store.go
+++ b/channeldb/migration32/mission_control_store.go
@@ -738,7 +738,7 @@ func serializeNewResult(rp *paymentResultNew) ([]byte, []byte, error) {
 		return nil, nil, err
 	}
 
-	return key, buff.Bytes(), err
+	return key, buff.Bytes(), nil
 }
 
 // getResultKeyNew returns a byte slice representing a unique key for this
diff --git a/contractcourt/htlc_timeout_resolver.go b/contractcourt/htlc_timeout_resolver.go
index f2b9ba2b7..5b8536398 100644
--- a/contractcourt/htlc_timeout_resolver.go
+++ b/contractcourt/htlc_timeout_resolver.go
@@ -487,7 +487,7 @@ func (h *htlcTimeoutResolver) sweepTimeoutTx() error {
 		return err
 	}
 
-	return err
+	return nil
 }
 
 // resolveSecondLevelTxLegacy sends a second level timeout transaction to the
@@ -593,7 +593,7 @@ func (h *htlcTimeoutResolver) waitForConfirmedSpend(op *wire.OutPoint,
 		return nil, err
 	}
 
-	return spend, err
+	return spend, nil
 }
 
 // Stop signals the resolver to cancel any current resolution processes, and
diff --git a/lnrpc/invoicesrpc/addinvoice_test.go b/lnrpc/invoicesrpc/addinvoice_test.go
index 546b9cc72..9394ce26d 100644
--- a/lnrpc/invoicesrpc/addinvoice_test.go
+++ b/lnrpc/invoicesrpc/addinvoice_test.go
@@ -89,7 +89,7 @@ func (h *hopHintsConfigMock) FetchChannelEdgesByID(chanID uint64) (
 	policy2, ok := args.Get(2).(*models.ChannelEdgePolicy)
 	require.True(h.t, ok)
 
-	return edgeInfo, policy1, policy2, err
+	return edgeInfo, policy1, policy2, nil
 }
 
 // getTestPubKey returns a valid parsed pub key to be used in our tests.
diff --git a/lnrpc/routerrpc/router_server_deprecated.go b/lnrpc/routerrpc/router_server_deprecated.go
index 7be1e3d91..a08cafcdd 100644
--- a/lnrpc/routerrpc/router_server_deprecated.go
+++ b/lnrpc/routerrpc/router_server_deprecated.go
@@ -118,7 +118,7 @@ func (s *Server) SendToRoute(ctx context.Context,
 		Failure:  resp.Failure,
 	}
 
-	return legacyResp, err
+	return legacyResp, nil
 }
 
 // QueryProbability returns the current success probability estimate for a
diff --git a/routing/missioncontrol_store.go b/routing/missioncontrol_store.go
index 5f4f521f5..7398ca0dc 100644
--- a/routing/missioncontrol_store.go
+++ b/routing/missioncontrol_store.go
@@ -186,7 +186,7 @@ func serializeResult(rp *paymentResult) ([]byte, []byte, error) {
 		return nil, nil, err
 	}
 
-	return key, buff.Bytes(), err
+	return key, buff.Bytes(), nil
 }
 
 // deserializeResult deserializes a payment result.