diff --git a/pkg/server.go b/pkg/server.go
index cac0de3..1d0f831 100644
--- a/pkg/server.go
+++ b/pkg/server.go
@@ -77,5 +77,16 @@ func (s *Server) ListenAndServe(address string) error {
 	// Run the polling user idle kicker.
 	s.upSince = time.Now()
 	go s.KickIdlePollUsers()
+	go s.sendWhoListAfterReady()
 	return http.ListenAndServe(address, s.mux)
 }
+
+// Send first WhoList update 15 seconds after the server reboots. This is in case a lot of chatters
+// are online during a reboot: we avoid broadcasting Presence for 30 seconds and WhoList for 15 to
+// reduce chatter and avoid kicking clients offline repeatedly for filling up their message buffer
+// as everyone rejoins the chat all at once.
+func (s *Server) sendWhoListAfterReady() {
+	time.Sleep(16 * time.Second)
+	log.Info("Up 15 seconds, sending WhoList to any online chatters")
+	s.SendWhoList()
+}
diff --git a/pkg/subscriber.go b/pkg/subscriber.go
index 0e7e624..27035b5 100644
--- a/pkg/subscriber.go
+++ b/pkg/subscriber.go
@@ -429,6 +429,18 @@ func (s *Server) SendTo(username string, msg messages.Message) error {
 
 // SendWhoList broadcasts the connected members to everybody in the room.
 func (s *Server) SendWhoList() {
+
+	// Don't send WhoList messages in the first 15 seconds of the server launch. This is to minimize
+	// messages sent during a server reboot if a lot of chatters were online: Presence messages are
+	// suppressed for 30 seconds, WhoList updates for 15, so that each user who reconnects doesn't
+	// spam updates to every other user, which would fill their message buffer and kick them off and
+	// makes for a rocky reboot. Instead: the server will send a WhoList to everyone at the 15 second
+	// mark, and then send them normally from then on.
+	if time.Since(s.upSince) < 15*time.Second {
+		log.Debug("skip sending WhoList messages within 15 seconds of server reboot")
+		return
+	}
+
 	var (
 		subscribers = s.IterSubscribers()
 		usernames   = []string{} // distinct and sorted usernames
diff --git a/src/App.vue b/src/App.vue
index 6fd4d86..0d658c7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5416,6 +5416,12 @@ export default {
 
                     <!-- Who Is Online -->
                     <div v-if="whoTab === 'online'">
+
+                        <!-- Show a loading spinner if we are connected but the Who List hasn't arrived -->
+                        <div v-if="connected && sortedWhoList.length === 0" class="is-size-7">
+                            <i class="fa fa-spinner fa-spin mr-1"></i> Waiting for Who List...
+                        </div>
+
                         <div v-for="(u, i) in sortedWhoList" v-bind:key="i">
                             <WhoListRow
                                 :user="u"