diff --git a/app/dashboard/views/batch_import.py b/app/dashboard/views/batch_import.py
index 79615bec..5ab18e43 100644
--- a/app/dashboard/views/batch_import.py
+++ b/app/dashboard/views/batch_import.py
@@ -28,6 +28,15 @@ def batch_import_route():
     batch_imports = BatchImport.filter_by(user_id=current_user.id).all()
 
     if request.method == "POST":
+        if len(batch_imports) > 10:
+            flash(
+                "You have too many imports already. Wait until some get cleaned up",
+                "error",
+            )
+            return render_template(
+                "dashboard/batch_import.html", batch_imports=batch_imports
+            )
+
         alias_file = request.files["alias-file"]
 
         file_path = random_string(20) + ".csv"
diff --git a/server.py b/server.py
index 43317caa..40157352 100644
--- a/server.py
+++ b/server.py
@@ -204,9 +204,10 @@ def create_app() -> Flask:
 @login_manager.user_loader
 def load_user(alternative_id):
     user = User.get_by(alternative_id=alternative_id)
-    if user and user.disabled:
-        return None
-    sentry_sdk.set_user({"email": user.email, "id": user.id})
+    if user:
+        sentry_sdk.set_user({"email": user.email, "id": user.id})
+        if user.disabled:
+            return None
 
     return user