diff --git a/__init__.py b/__init__.py
index 9aaae6d..f5afa10 100644
--- a/__init__.py
+++ b/__init__.py
@@ -95,11 +95,12 @@ def load(app):
                 except Exception: continue
 
         # 6. No Match: Log exactly one incorrect attempt globally
-        db.session.add(Submissions(
-            user_id=user.id, team_id=team.id if team else None,
-            challenge_id=None, ip=request.remote_addr, provided=provided, type='incorrect'
-        ))
-        db.session.commit()
+        if (len(challenges) > 0):
+            db.session.add(Submissions(
+                user_id=user.id, team_id=team.id if team else None,
+                challenge_id=challenges[0].id, ip=request.remote_addr, provided=provided, type='incorrect'
+            ))
+            db.session.commit()
         return jsonify({'success': False, 'message': 'Incorrect Flag'})
 
     app.register_blueprint(plugin_bp)