diff --git a/beflask/app.py b/beflask/app.py
index 8e5eeca..00eee59 100644
--- a/beflask/app.py
+++ b/beflask/app.py
@@ -26,7 +26,7 @@ def make_shell_context():
     return {"db": db, "User": User}
 
 
-def create_app(config_name=None):
+def create_app(config_name=None, return_socketio=False):
     if config_name is None:
         config_name = os.environ.get("BEFLASK_ENV", "development")
     app = Flask(__name__)
@@ -47,5 +47,7 @@ def create_app(config_name=None):
         from .interactive.main_interactive import interactive
 
         app.register_blueprint(interactive, url_prefix="/admin")
-
-    return socketio, app
+    if return_socketio:
+        return socketio, app
+    else:
+        return app
diff --git a/run.py b/run.py
index 2461be8..9d28357 100755
--- a/run.py
+++ b/run.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
 from beflask import app
 
-socketio, app = app.create_app()
+socketio, app = app.create_app(return_socketio=True)
 socketio.run(app, debug=app.config["DEBUG"])