diff --git a/gossipd/gossip.c b/gossipd/gossip.c
index 5fc38fda5..ca7a1b30e 100644
--- a/gossipd/gossip.c
+++ b/gossipd/gossip.c
@@ -2492,6 +2492,7 @@ static struct io_plan *dev_set_max_scids_encode_size(struct io_conn *conn,
 							   &max_scids_encode_bytes))
 		master_badmsg(WIRE_GOSSIP_DEV_SET_MAX_SCIDS_ENCODE_SIZE, msg);
 
+	status_trace("Set max_scids_encode_bytes to %u", max_scids_encode_bytes);
 	return daemon_conn_read_next(conn, &daemon->master);
 }
 #endif /* DEVELOPER */
diff --git a/tests/test_lightningd.py b/tests/test_lightningd.py
index 8d3a9c402..dfec8276c 100644
--- a/tests/test_lightningd.py
+++ b/tests/test_lightningd.py
@@ -2745,6 +2745,9 @@ class LightningDTests(BaseLightningDTests):
 
         # Restore infinite encode size.
         l2.rpc.dev_set_max_scids_encode_size(max=(2**32 - 1))
+        l2.daemon.wait_for_log('Set max_scids_encode_bytes to {}'
+                               .format(2**32 - 1))
+
         ret = l1.rpc.dev_query_channel_range(id=l2.info['id'],
                                              first=0,
                                              num=65535)