diff --git a/nyaa/api_handler.py b/nyaa/api_handler.py
index c6087b4..571cc4d 100644
--- a/nyaa/api_handler.py
+++ b/nyaa/api_handler.py
@@ -240,11 +240,10 @@ def ghetto_import():
         if not tracker:
             tracker = models.Trackers(uri=announce)
             db.session.add(tracker)
+            db.session.flush()
 
         db_trackers.add(tracker)
 
-    db.session.flush()
-
     # Store tracker refs in DB
     for order, tracker in enumerate(db_trackers):
         torrent_tracker = models.TorrentTrackers(torrent_id=torrent.id,
diff --git a/nyaa/backend.py b/nyaa/backend.py
index 1c96095..c2b1fe1 100644
--- a/nyaa/backend.py
+++ b/nyaa/backend.py
@@ -139,11 +139,10 @@ def handle_torrent_upload(upload_form, uploading_user=None, fromAPI=False):
         if not tracker:
             tracker = models.Trackers(uri=announce)
             db.session.add(tracker)
+            db.session.flush()
 
         db_trackers.add(tracker)
 
-    db.session.flush()
-
     # Store tracker refs in DB
     for order, tracker in enumerate(db_trackers):
         torrent_tracker = models.TorrentTrackers(torrent_id=torrent.id,