diff --git a/.gitignore b/.gitignore
index 745d522..31655b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,6 @@ node_modules/
 .env
 yarn-error.log
 cache
-tests/.bin/
\ No newline at end of file
+tests/.bin/
+
+.vscode
\ No newline at end of file
diff --git a/src/utils/helpers/diamond.ts b/src/utils/helpers/diamond.ts
index 8271ba6..191983d 100644
--- a/src/utils/helpers/diamond.ts
+++ b/src/utils/helpers/diamond.ts
@@ -394,6 +394,9 @@ export function updateAavegotchiInfo(
         let owner = getOrCreateUser(gotchiInfo.owner.toHexString());
         owner.save();
         gotchi.owner = owner.id;
+        if (!gotchi.originalOwner) {
+            gotchi.originalOwner = owner.id;
+        }
         gotchi.name = gotchiInfo.name;
         gotchi.nameLowerCase = gotchiInfo.name.toLowerCase();
         gotchi.randomNumber = gotchiInfo.randomNumber;