diff --git a/src/broker/comm.bif b/src/broker/comm.bif
index a6f7876766..2b6d4be802 100644
--- a/src/broker/comm.bif
+++ b/src/broker/comm.bif
@@ -117,12 +117,12 @@ function Broker::__peers%(%): PeerInfos
 
 		if ( n )
 			{
-			network_info->Assign(0, zeek::make_intrusive<zeek::AddrVal>(IPAddr(n->address)));
+			network_info->Assign(0, zeek::make_intrusive<zeek::StringVal>(n->address));
 			network_info->Assign(1, zeek::val_mgr->Port(n->port, TRANSPORT_TCP));
 			}
 		else
 			{
-			network_info->Assign(0, zeek::make_intrusive<zeek::AddrVal>("0.0.0.0"));
+			network_info->Assign(0, zeek::make_intrusive<zeek::StringVal>("0.0.0.0"));
 			network_info->Assign(1, zeek::val_mgr->Port(0, TRANSPORT_TCP));
 			}
 
diff --git a/testing/btest/Baseline/broker.unpeer/send.send.out b/testing/btest/Baseline/broker.unpeer/send.send.out
index 1dde0d93df..0d205efdc9 100644
--- a/testing/btest/Baseline/broker.unpeer/send.send.out
+++ b/testing/btest/Baseline/broker.unpeer/send.send.out
@@ -1,4 +1,5 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+peered, now 1 peer(s)
 Something sender, 1
 unpeering
 Something sender, 2
diff --git a/testing/btest/broker/unpeer.zeek b/testing/btest/broker/unpeer.zeek
index e246b3ddc5..fd057af241 100644
--- a/testing/btest/broker/unpeer.zeek
+++ b/testing/btest/broker/unpeer.zeek
@@ -43,6 +43,7 @@ event zeek_init()
 
 event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)
     {
+    print fmt("peered, now %d peer(s)", |Broker::peers()|);
     schedule 2secs { print_something(1) };
     schedule 4secs { unpeer(endpoint) };
     }