diff --git a/middleware/Auth/SessionAuthMiddleware.php b/middleware/Auth/SessionAuthMiddleware.php
index 83f2e343..f79572c7 100644
--- a/middleware/Auth/SessionAuthMiddleware.php
+++ b/middleware/Auth/SessionAuthMiddleware.php
@@ -25,7 +25,7 @@ class SessionAuthMiddleware extends BaseAuthMiddleware
 				$user = $sessionService->GetUserByToken(SessionService::SESSION_TOKEN_TYPE_REMEMBER_ME, $_COOKIE[SessionService::SESSION_TOKEN_COOKIE_NAME_REMEMBER_ME]);
 				if ($user !== null)
 				{
-					// Remember me token was valid => create a new access token and extend the lifetime of the remember me token cookie
+					// Remember me token is valid => create a new access token and extend the lifetime of the remember me token cookie
 					$token = $sessionService->CreateToken(SessionService::SESSION_TOKEN_TYPE_ACCESS, $user->id, GetClientUserAgent());
 					self::SetSessionCookie(SessionService::SESSION_TOKEN_TYPE_ACCESS, $token);
 					self::SetSessionCookie(SessionService::SESSION_TOKEN_TYPE_REMEMBER_ME, $_COOKIE[SessionService::SESSION_TOKEN_COOKIE_NAME_REMEMBER_ME]);
@@ -33,7 +33,7 @@ class SessionAuthMiddleware extends BaseAuthMiddleware
 				}
 			}
 
-			// Remember me token was also not valid => remove the cookie
+			// Remember me token is also not valid => remove the cookie
 			self::RemoveSessionCookie(SessionService::SESSION_TOKEN_TYPE_REMEMBER_ME);
 		}
 
diff --git a/services/DatabaseMigrationService.php b/services/DatabaseMigrationService.php
index 00ba4db6..86ffe164 100644
--- a/services/DatabaseMigrationService.php
+++ b/services/DatabaseMigrationService.php
@@ -40,8 +40,6 @@ class DatabaseMigrationService extends BaseService
 		{
 			DatabaseService::GetInstance()->ExecuteDbStatement('VACUUM');
 		}
-
-		SessionService::GetInstance()->DeleteExpiredTokens();
 	}
 
 	private function ExecutePhpMigrationWhenNeeded(int $migrationId, string $phpFile, int &$migrationCounter)
diff --git a/services/SessionService.php b/services/SessionService.php
index ce6c8214..ed74111c 100644
--- a/services/SessionService.php
+++ b/services/SessionService.php
@@ -45,6 +45,7 @@ class SessionService extends BaseService
 	public function DeleteToken(int $tokenType, string $token)
 	{
 		$this->DB->sessions()->where('token_type = :1 AND token_hash = :2', $tokenType, hash('sha256', $token))->delete();
+		$this->DeleteExpiredTokens();
 	}
 
 	public function ValidateToken(int $tokenType, string $token)
@@ -89,7 +90,7 @@ class SessionService extends BaseService
 		return $this->DB->users()->orderBy('id')->limit(1)->fetch();
 	}
 
-	public function DeleteExpiredTokens()
+	private function DeleteExpiredTokens()
 	{
 		$this->DB->sessions()->where('expires < :1', date('Y-m-d H:i:s', time()))->delete();
 	}