diff --git a/data/database.py b/data/database.py
index eaf2f0ff0..c8fa6cf25 100644
--- a/data/database.py
+++ b/data/database.py
@@ -5,6 +5,7 @@ import uuid
 from random import SystemRandom
 from datetime import datetime
 from peewee import *
+from playhouse.pool import PooledMySQLDatabase
 from sqlalchemy.engine.url import make_url
 from urlparse import urlparse
 
@@ -15,7 +16,7 @@ logger = logging.getLogger(__name__)
 
 
 SCHEME_DRIVERS = {
-  'mysql': MySQLDatabase,
+  'mysql': PooledMySQLDatabase,
   'sqlite': SqliteDatabase,
 }