diff --git a/src/sentry/south_migrations/0364_backfill_grouplink_from_groupcommitresolution.py b/src/sentry/south_migrations/0364_backfill_grouplink_from_groupcommitresolution.py
index 6be8bc03e21818..0613e9d791a174 100644
--- a/src/sentry/south_migrations/0364_backfill_grouplink_from_groupcommitresolution.py
+++ b/src/sentry/south_migrations/0364_backfill_grouplink_from_groupcommitresolution.py
@@ -32,25 +32,26 @@ def _forwards(self, orm):
 
         queryset = GroupCommitResolution.objects.all()
 
-        group_to_project_ids = dict(Group.objects.filter(
-            id__in=queryset.values_list('group_id', flat=True)
-        ).values_list("id", "project_id"))
-
         for group_commit_resolution in RangeQuerySetWrapperWithProgressBar(queryset):
             try:
+
+                project_id = Group.objects.filter(
+                    id=group_commit_resolution.group_id).values_list(
+                    'project_id', flat=True)[0]
+
                 with transaction.atomic():
                     GroupLink.objects.create(
                         group_id=group_commit_resolution.group_id,
                         linked_id=group_commit_resolution.commit_id,
                         datetime=group_commit_resolution.datetime,
 
-                        project_id=group_to_project_ids[group_commit_resolution.group_id],
+                        project_id=project_id,
 
                         linked_type=1,  # literal value used because we don't have access to the actual class
                         relationship=1
                     )
 
-            except IntegrityError:
+            except (IntegrityError, IndexError):
                 pass
 
     def backwards(self, orm):