diff --git a/plexpy/__init__.py b/plexpy/__init__.py
index 95298144..2a464062 100644
--- a/plexpy/__init__.py
+++ b/plexpy/__init__.py
@@ -439,7 +439,7 @@ def initialize_scheduler():
 
         backup_hours = CONFIG.BACKUP_INTERVAL if 1 <= CONFIG.BACKUP_INTERVAL <= 24 else 6
 
-        schedule_job(database.optimize, 'Optimize Tautulli database',
+        schedule_job(database.optimize_db, 'Optimize Tautulli database',
                      hours=24, minutes=0, seconds=0)
         schedule_job(database.make_backup, 'Backup Tautulli database',
                      hours=backup_hours, minutes=0, seconds=0, args=(True, True))
diff --git a/plexpy/database.py b/plexpy/database.py
index c994068b..8b0681e2 100644
--- a/plexpy/database.py
+++ b/plexpy/database.py
@@ -286,7 +286,18 @@ def vacuum():
 
 
 def optimize():
+    monitor_db = MonitorDatabase()
+
+    logger.info("Tautulli Database :: Optimizing database.")
+    try:
+        monitor_db.action('PRAGMA optimize')
+    except Exception as e:
+        logger.error("Tautulli Database :: Failed to optimize database: %s" % e)
+
+
+def optimize_db():
     vacuum()
+    optimize()
 
 
 def db_filename(filename=FILENAME):