diff --git a/ui/workers/calculate_origin_mark_worker.py b/ui/workers/calculate_origin_mark_worker.py
index 87486de..c813109 100644
--- a/ui/workers/calculate_origin_mark_worker.py
+++ b/ui/workers/calculate_origin_mark_worker.py
@@ -118,14 +118,16 @@ class CalculateOriginMarkWorker(QRunnable):
             # If there are no encounters for the pokemon form or its evolution line from this generation,
             # use the mark of the earliest game of the generation is marked as being introducted in.
             if encounters:
-                earliest_game = 100
+                earliest_game_id = 100
+                earliest_game = None
                 for encounter in encounters:
                     game_info = db.get_game_by_id(encounter["game_id"])
-                    if game_info["id"] <= earliest_game:
-                        earliest_game = game_info["id"]
-                if earliest_game < 100:
+                    if game_info["id"] <= earliest_game_id:
+                        earliest_game_id = game_info["id"]
+                        earliest_game = game_info
+                if earliest_game_id < 100:
                     form_info = db.get_pokemon_details(pfic)
-                    mark_id = game_info["mark"]
+                    mark_id = earliest_game["mark"]
                     if mark_id == None:
                         print(f"No mark found for {get_display_name(form_info)}")
                         pass
@@ -136,14 +138,16 @@ class CalculateOriginMarkWorker(QRunnable):
     
             event_encounters = db.get_encounters(pfic, "event")
             if event_encounters:
-                earliest_game = 100
+                earliest_game_id = 100
+                earliest_game = None
                 for encounter in event_encounters:
                     game_info = game_info = db.get_game_by_id(encounter["game_id"])
-                    if game_info["id"] <= earliest_game:
-                        earliest_game = game_info["id"]
-                if earliest_game < 100:
+                    if game_info["id"] <= earliest_game_id:
+                        earliest_game_id = game_info["id"]
+                        earliest_game = game_info
+                if earliest_game_id < 100:
                     form_info = db.get_pokemon_details(pfic)
-                    mark_id = game_info["mark"]
+                    mark_id = earliest_game["mark"]
                     if mark_id == None:
                         print(f"No mark found for {get_display_name(form_info)}")
                     else: