diff --git a/app/notification_push.go b/app/notification_push.go
index 19cab67fe4..21f2f5c757 100644
--- a/app/notification_push.go
+++ b/app/notification_push.go
@@ -25,13 +25,16 @@ const (
 	notificationTypeClear       notificationType = "clear"
 	notificationTypeMessage     notificationType = "message"
 	notificationTypeUpdateBadge notificationType = "update_badge"
+	notificationTypeDummy       notificationType = "dummy"
 )
 
 type PushNotificationsHub struct {
 	notificationsChan chan PushNotification
 	app               *App // XXX: This will go away once push notifications move to their own package.
 	sema              chan struct{}
+	stopChan          chan struct{}
 	wg                *sync.WaitGroup
+	buffer            int
 }
 
 type PushNotification struct {
@@ -256,54 +259,70 @@ func (s *Server) createPushNotificationsHub() {
 		app:               fakeApp,
 		wg:                new(sync.WaitGroup),
 		sema:              make(chan struct{}, runtime.NumCPU()*8), // numCPU * 8 is a good amount of concurrency.
+		stopChan:          make(chan struct{}),
+		buffer:            buffer,
 	}
 	go hub.start()
 	s.PushNotificationsHub = hub
 }
 
 func (hub *PushNotificationsHub) start() {
-	for notification := range hub.notificationsChan {
-		// Adding to the waitgroup first.
-		hub.wg.Add(1)
-		// Get token.
-		hub.sema <- struct{}{}
-		go func(notification PushNotification) {
-			defer func() {
-				// Release token.
-				<-hub.sema
-				// Now marking waitgroup as done.
-				hub.wg.Done()
-			}()
+	for {
+		select {
+		case notification := <-hub.notificationsChan:
+			// Adding to the waitgroup first.
+			hub.wg.Add(1)
+			// Get token.
+			hub.sema <- struct{}{}
+			go func(notification PushNotification) {
+				defer func() {
+					// Release token.
+					<-hub.sema
+					// Now marking waitgroup as done.
+					hub.wg.Done()
+				}()
 
-			var err *model.AppError
-			switch notification.notificationType {
-			case notificationTypeClear:
-				err = hub.app.clearPushNotificationSync(notification.currentSessionId, notification.userId, notification.channelId)
-			case notificationTypeMessage:
-				err = hub.app.sendPushNotificationSync(
-					notification.post,
-					notification.user,
-					notification.channel,
-					notification.channelName,
-					notification.senderName,
-					notification.explicitMention,
-					notification.channelWideMention,
-					notification.replyToThreadType,
-				)
-			case notificationTypeUpdateBadge:
-				err = hub.app.updateMobileAppBadgeSync(notification.userId)
-			default:
-				mlog.Error("Invalid notification type", mlog.String("notification_type", string(notification.notificationType)))
-			}
+				var err *model.AppError
+				switch notification.notificationType {
+				case notificationTypeClear:
+					err = hub.app.clearPushNotificationSync(notification.currentSessionId, notification.userId, notification.channelId)
+				case notificationTypeMessage:
+					err = hub.app.sendPushNotificationSync(
+						notification.post,
+						notification.user,
+						notification.channel,
+						notification.channelName,
+						notification.senderName,
+						notification.explicitMention,
+						notification.channelWideMention,
+						notification.replyToThreadType,
+					)
+				case notificationTypeUpdateBadge:
+					err = hub.app.updateMobileAppBadgeSync(notification.userId)
+				case notificationTypeDummy:
+					return
+				default:
+					mlog.Error("Invalid notification type", mlog.String("notification_type", string(notification.notificationType)))
+				}
 
-			if err != nil {
-				mlog.Error("Unable to send push notification", mlog.String("notification_type", string(notification.notificationType)), mlog.Err(err))
-			}
-		}(notification)
+				if err != nil {
+					mlog.Error("Unable to send push notification", mlog.String("notification_type", string(notification.notificationType)), mlog.Err(err))
+				}
+			}(notification)
+		case <-hub.stopChan:
+			return
+		}
 	}
 }
 
 func (hub *PushNotificationsHub) stop() {
+	// Drain the channel.
+	for i := 0; i < hub.buffer+1; i++ {
+		hub.notificationsChan <- PushNotification{
+			notificationType: notificationTypeDummy,
+		}
+	}
+	hub.stopChan <- struct{}{}
 	close(hub.notificationsChan)
 	hub.wg.Wait()
 }
diff --git a/app/server.go b/app/server.go
index 1659fc7ee3..904347c37b 100644
--- a/app/server.go
+++ b/app/server.go
@@ -641,7 +641,6 @@ func (s *Server) Shutdown() error {
 	defer sentry.Flush(2 * time.Second)
 
 	s.HubStop()
-	s.StopPushNotificationsHubWorkers()
 	s.ShutDownPlugins()
 	s.RemoveLicenseListener(s.licenseListenerId)
 	s.RemoveClusterLeaderChangedListener(s.clusterLeaderListenerId)
@@ -659,6 +658,8 @@ func (s *Server) Shutdown() error {
 
 	s.StopHTTPServer()
 	s.stopLocalModeServer()
+	// Push notification hub needs to be shutdown after HTTP server
+	s.StopPushNotificationsHubWorkers()
 
 	s.WaitForGoroutines()