diff --git a/lnwallet/channel.go b/lnwallet/channel.go
index b420b6134c..c7201402cc 100644
--- a/lnwallet/channel.go
+++ b/lnwallet/channel.go
@@ -5553,7 +5553,10 @@ func genHtlcSigValidationJobs(chanState *channeldb.OpenChannel,
 			// disk later.
 			sigType := htlcCustomSigType.TypeVal()
 			auxSig.WhenSome(func(sigB tlv.Blob) {
-				htlc.CustomRecords[uint64(sigType)] = sigB
+				if htlc.CustomRecords != nil {
+					htlc.CustomRecords[uint64(sigType)] =
+						sigB
+				}
 			})
 
 			auxVerifyJobs = append(auxVerifyJobs, auxVerifyJob)