diff --git a/core/core.go b/core/core.go
index 01de48da3..be3fd4e04 100644
--- a/core/core.go
+++ b/core/core.go
@@ -64,6 +64,8 @@ func startCleanupTimer() {
 		for {
 			select {
 			case <-_cleanupTimer.C:
+				// Reset the session count since the session is over
+				_stats.SessionMaxViewerCount = 0
 				resetDirectories()
 				ffmpeg.ShowStreamOfflineState()
 			}
diff --git a/core/status.go b/core/status.go
index c512915f0..cd720667c 100644
--- a/core/status.go
+++ b/core/status.go
@@ -33,11 +33,6 @@ func SetStreamAsConnected() {
 	_stats.LastConnectTime = utils.NullTime{time.Now(), true}
 	_stats.LastDisconnectTime = utils.NullTime{time.Now(), false}
 
-	timeSinceDisconnect := time.Since(_stats.LastDisconnectTime.Time).Minutes()
-	if timeSinceDisconnect > 15 {
-		_stats.SessionMaxViewerCount = 0
-	}
-
 	chunkPath := config.Config.GetPublicHLSSavePath()
 	if usingExternalStorage {
 		chunkPath = config.Config.GetPrivateHLSSavePath()