diff --git a/htlcswitch/switch.go b/htlcswitch/switch.go
index 94c424a2f..52a24035e 100644
--- a/htlcswitch/switch.go
+++ b/htlcswitch/switch.go
@@ -1061,7 +1061,7 @@ func (s *Switch) handlePacketForward(packet *htlcPacket) error {
 					fail.Reason,
 				)
 			}
-		} else {
+		} else if !isFail && circuit.Outgoing != nil {
 			// If this is an HTLC settle, and it wasn't from a
 			// locally initiated HTLC, then we'll log a forwarding
 			// event so we can flush it to disk later.