diff --git a/nplusone/ext/flask_sqlalchemy.py b/nplusone/ext/flask_sqlalchemy.py
index d9ef2f3..5c14fd6 100644
--- a/nplusone/ext/flask_sqlalchemy.py
+++ b/nplusone/ext/flask_sqlalchemy.py
@@ -48,7 +48,7 @@ def connect():
         @app.after_request
         def disconnect(response):
             for name in six.iterkeys(listeners.listeners):
-                listener = g.listeners.pop(name, None)
+                listener = g.get('listeners', {}).pop(name, None)
                 if listener:
                     listener.teardown()
             return response