diff --git a/database/database.py b/database/database.py
index ca47e34440624574a64318639ce550d4ca5fc9b0..a7e76463488ad1f3c4f78082b4cfb49417682786 100644
--- a/database/database.py
+++ b/database/database.py
@@ -9,17 +9,14 @@ db_password = environ["DATABASE_PASSWORD"]
 db_host = environ["DATABASE_HOST"]
 db_name = environ["DATABASE_NAME"]
 
-Session = sessionmaker()
-Base = declarative_base()
-
 engine = create_engine('postgresql://{0}:{1}@{2}/{3}'.format(
     db_user, db_password, db_host, db_name))
 
-Session.configure(bind=engine, autocommit=True)
 db_session = scoped_session(sessionmaker(autocommit=False,
                                      autoflush=False,
                                      bind=engine))
 
+Base = declarative_base()
 Base.query = db_session.query_property()
 
 def get_user_datastore():