diff --git a/rpcserver.go b/rpcserver.go
index 71498f7e..f9dad316 100644
--- a/rpcserver.go
+++ b/rpcserver.go
@@ -3821,15 +3821,20 @@ func (r *rpcServer) GetNodeInfo(ctx context.Context,
 		numChannels++
 		totalCapacity += edge.Capacity
 
-		// Do not include unannounced channels - private channels or public
-		// channels whose authentication proof were not confirmed yet.
-		if edge.AuthProof == nil {
-			return nil
-		}
+		// Only populate the node's channels if the user requested them.
+		if in.IncludeChannels {
+			// Do not include unannounced channels - private
+			// channels or public channels whose authentication
+			// proof were not confirmed yet.
+			if edge.AuthProof == nil {
+				return nil
+			}
 
-		// Convert the database's edge format into the network/RPC edge format.
-		channelEdge := marshalDbEdge(edge, c1, c2)
-		channels = append(channels, channelEdge)
+			// Convert the database's edge format into the
+			// network/RPC edge format.
+			channelEdge := marshalDbEdge(edge, c1, c2)
+			channels = append(channels, channelEdge)
+		}
 
 		return nil
 	}); err != nil {