diff --git a/cmd/poll.go b/cmd/poll.go
index c6a24dc64f0403f64cf38e2ebbef839411bcf2c1..8ceb647b81161b95315d5d404c308c5928da50a7 100644
--- a/cmd/poll.go
+++ b/cmd/poll.go
@@ -153,9 +153,15 @@ func (m *RegistrationImpl) Poll(msg *pb.PermissioningPoll, auth *connect.Auth,
 	if updateNotification.ToActivity == current.ERROR {
 		updateNotification.Error = msg.Error
 	}
+	err = m.State.SendUpdateNotification(updateNotification)
+	if err!=nil{
+		jww.WARN.Printf("Failed to send update notification, " +
+			"is the update thread running?")
+		n.GetPollingLock().Unlock()
+	}
 
 	// Update occurred, report it to the control thread
-	return response, m.State.SendUpdateNotification(updateNotification)
+	return response, err
 }
 
 // PollNdf handles the client polling for an updated NDF
diff --git a/storage/state.go b/storage/state.go
index 96eb0fbe5cfd0f9b71fffa919162e4a9f81d8a64..ffa96c7d60501c1be148607214b878bc61d193c9 100644
--- a/storage/state.go
+++ b/storage/state.go
@@ -25,7 +25,7 @@ import (
 	"time"
 )
 
-const updateBufferLength = 1000
+const updateBufferLength = 10000
 
 // NetworkState structure used for keeping track of NDF and Round state.
 type NetworkState struct {