diff --git a/network/follow.go b/network/follow.go
index 89df4f805aab95933eba24cf3d0905ca8499920f..5f3491587a1c7a7e74ccf3695ccb6958c5d320ee 100644
--- a/network/follow.go
+++ b/network/follow.go
@@ -223,6 +223,11 @@ func (m *manager) follow(report interfaces.ClientErrorReport, rng csprng.Source,
 		}
 	}
 
+	// Update the address space size
+	if len(m.Instance.GetPartialNdf().Get().AddressSpace) != 0 {
+		m.addrSpace.Update(m.Instance.GetPartialNdf().Get().AddressSpace[0].Size)
+	}
+
 	// NOTE: this updates rounds and updates the tracking of the health of the network
 	if pollResp.Updates != nil {
 		// TODO: ClientErr needs to know the source of the error and it doesn't yet
diff --git a/network/manager.go b/network/manager.go
index c968102e2f5b04269c123c5d1b624ae7a865678a..bba264c6b63263a196d4bfc135f1db42649948ec 100644
--- a/network/manager.go
+++ b/network/manager.go
@@ -105,6 +105,7 @@ func NewManager(session *storage.Session, switchboard *switchboard.Switchboard,
 		events:        events,
 		earliestRound: &earliest,
 	}
+	m.addrSpace.Update(18)
 
 	if params.VerboseRoundTracking {
 		m.verboseRounds = NewRoundTracker()