diff --git a/web/webapp/directory.py b/web/webapp/directory.py
index 32b9b1a..84dd294 100644
--- a/web/webapp/directory.py
+++ b/web/webapp/directory.py
@@ -38,14 +38,14 @@ def connect():
                     app.config['LDAP_BIND_PASSWORD'])
     return c
 
+if not app.config.get('DISABLE_LDAP'):
+    @app.before_request
+    def _setup_ldap():
+        g.ldap = connect()
 
-@app.before_request
-def _setup_ldap():
-    g.ldap = connect()
-
-@app.teardown_request
-def _destroy_ldap(exception=None):
-    g.ldap.unbind_s()
+    @app.teardown_request
+    def _destroy_ldap(exception=None):
+        g.ldap.unbind_s()
 
 def get_ldap_group_diff(members):
     active_members = filter(lambda m: m['judgement'], members)