diff --git a/lib/lnbase.py b/lib/lnbase.py
index 2c4a39d21..f6f9829e7 100644
--- a/lib/lnbase.py
+++ b/lib/lnbase.py
@@ -273,7 +273,7 @@ OnlyPubkeyKeypair = namedtuple("OnlyPubkeyKeypair", ["pubkey"])
 RemoteState = namedtuple("RemoteState", ["ctn", "next_per_commitment_point", "amount_msat", "revocation_store", "last_per_commitment_point", "next_htlc_id"])
 LocalState = namedtuple("LocalState", ["ctn", "per_commitment_secret_seed", "amount_msat", "next_htlc_id"])
 ChannelConstraints = namedtuple("ChannelConstraints", ["feerate", "capacity", "is_initiator", "funding_txn_minimum_depth"])
-OpenChannel = namedtuple("OpenChannel", ["channel_id", "short_channel_id", "funding_outpoint", "local_config", "remote_config", "remote_state", "local_state", "constraints"])
+OpenChannel = namedtuple("OpenChannel", ["channel_id", "short_channel_id", "funding_outpoint", "local_config", "remote_config", "remote_state", "local_state", "constraints", "node_id"])
 
 
 def aiosafe(f):
@@ -933,6 +933,7 @@ class Peer(PrintError):
         assert success, success
         their_revocation_store = RevocationStore()
         chan = OpenChannel(
+                node_id=self.pubkey,
                 channel_id=channel_id,
                 short_channel_id=None,
                 funding_outpoint=Outpoint(funding_txid, funding_index),
diff --git a/lib/lnworker.py b/lib/lnworker.py
index c5937b341..5d6526388 100644
--- a/lib/lnworker.py
+++ b/lib/lnworker.py
@@ -25,7 +25,7 @@ from . import lnrouter
 is_key = lambda k: k.endswith("_basepoint") or k.endswith("_key")
 
 def maybeDecode(k, v):
-    if k in ["short_channel_id", "pubkey", "privkey", "last_per_commitment_point", "next_per_commitment_point", "per_commitment_secret_seed"] and v is not None:
+    if k in ["node_id", "short_channel_id", "pubkey", "privkey", "last_per_commitment_point", "next_per_commitment_point", "per_commitment_secret_seed"] and v is not None:
         return binascii.unhexlify(v)
     return v