diff --git a/manage.py b/manage.py
index 96cfc702..cfcb82e6 100644
--- a/manage.py
+++ b/manage.py
@@ -4,7 +4,6 @@ This file is used to run the application.
 
 from datetime import datetime, timezone
 import os
-import logging
 from flask_jwt_extended import (
     create_access_token,
     get_jwt,
@@ -16,7 +15,6 @@ import psutil
 import mimetypes
 from flask import Response, request
 
-import waitress
 import setproctitle
 
 from app.api import create_api
@@ -27,8 +25,6 @@ from app.plugins.register import register_plugins
 from app.settings import FLASKVARS, TCOLOR, Info
 from app.setup import load_into_mem, run_setup
 from app.start_info_logger import log_startup_info
-from app.store.artists import ArtistStore
-from app.store.tracks import TrackStore
 from app.utils.filesystem import get_home_res_path
 from app.utils.paths import getClientFilesExtensions
 from app.utils.threading import background
@@ -245,4 +241,8 @@ if __name__ == "__main__":
     #     ipv6=True,
     #     ipv4=True,
     # )
-    app.run(host=host, port=port, debug=False)
+    # app.run(host=host, port=port, debug=False)
+    from gevent.pywsgi import WSGIServer
+
+    server = WSGIServer((host, port), app, log=None)
+    server.serve_forever()
diff --git a/pyproject.toml b/pyproject.toml
index dc36a713..2b98ebf4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -33,6 +33,7 @@ dependencies = [
     "schedule>=1.2.2",
     "flask-openapi3>=4.0.3",
     "pillow>=11.1.0",
+    "gevent>=24.11.1",
 ]
 
 [dependency-groups]
diff --git a/uv.lock b/uv.lock
index 9fa5bfec..c0292e2f 100644
--- a/uv.lock
+++ b/uv.lock
@@ -1212,6 +1212,7 @@ dependencies = [
     { name = "flask-cors" },
     { name = "flask-jwt-extended" },
     { name = "flask-openapi3" },
+    { name = "gevent" },
     { name = "locust" },
     { name = "memory-profiler" },
     { name = "pendulum" },
@@ -1247,6 +1248,7 @@ requires-dist = [
     { name = "flask-cors", specifier = ">=3.0.10" },
     { name = "flask-jwt-extended", specifier = ">=4.6.0" },
     { name = "flask-openapi3", specifier = ">=4.0.3" },
+    { name = "gevent", specifier = ">=24.11.1" },
     { name = "locust", specifier = ">=2.20.1" },
     { name = "memory-profiler", specifier = ">=0.61.0" },
     { name = "pendulum", specifier = ">=3.0.0" },