diff --git a/itest/lnd_misc_test.go b/itest/lnd_misc_test.go
index 138232706..f6252132f 100644
--- a/itest/lnd_misc_test.go
+++ b/itest/lnd_misc_test.go
@@ -257,6 +257,17 @@ func testListChannels(ht *lntest.HarnessTest) {
 	assertChannelConstraintsEqual(
 		ht, aliceChannel.RemoteConstraints, bobChannel.LocalConstraints,
 	)
+
+	// Finally we assert that the flap count is updated as expected.
+	resp := alice.RPC.ListPeers()
+
+	// Assert Alice only have one peer.
+	require.Len(ht, resp.Peers, 1)
+	for _, p := range resp.Peers {
+		// The channel open event resulted in an online event, so we
+		// expect the flap count to be 1.
+		require.EqualValues(ht, 1, p.FlapCount)
+	}
 }
 
 // testMaxPendingChannels checks that error is returned from remote peer if
diff --git a/rpcserver.go b/rpcserver.go
index 6fb050711..d3d3c5180 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -3561,8 +3561,12 @@ func (r *rpcServer) ListPeers(ctx context.Context,
 			flap, ts, err := r.server.chanEventStore.FlapCount(
 				vertex,
 			)
+
+			// Log the error if we cannot get the flap count instead
+			// of failing this RPC call.
 			if err != nil {
-				return nil, err
+				rpcsLog.Debugf("Failed to get flap count for "+
+					"peer %v", vertex)
 			}
 
 			// If our timestamp is non-nil, we have values for our