diff --git a/Kyoo/Controllers/Repositories/GenreRepository.cs b/Kyoo/Controllers/Repositories/GenreRepository.cs
index a908a339..11931c10 100644
--- a/Kyoo/Controllers/Repositories/GenreRepository.cs
+++ b/Kyoo/Controllers/Repositories/GenreRepository.cs
@@ -58,7 +58,7 @@ namespace Kyoo.Controllers
 
 			Genre old = await Get(obj.Slug);
 			if (old != null)
-				return obj.ID;
+				return old.ID;
 			return await Create(obj);
 		}
 
diff --git a/Kyoo/Controllers/Repositories/ShowRepository.cs b/Kyoo/Controllers/Repositories/ShowRepository.cs
index b8e2e2d8..8d5a6772 100644
--- a/Kyoo/Controllers/Repositories/ShowRepository.cs
+++ b/Kyoo/Controllers/Repositories/ShowRepository.cs
@@ -60,6 +60,15 @@ namespace Kyoo.Controllers
 
 			await Validate(obj);
 			_database.Entry(obj).State = EntityState.Added;
+			if (obj.GenreLinks != null)
+				foreach (GenreLink entry in obj.GenreLinks)
+					_database.Entry(entry).State = EntityState.Added;
+			if (obj.People != null)
+				foreach (PeopleLink entry in obj.People)
+					_database.Entry(entry).State = EntityState.Added;
+			if (obj.ExternalIDs != null)
+				foreach (MetadataID entry in obj.ExternalIDs)
+					_database.Entry(entry).State = EntityState.Added;
 			await _database.SaveChangesAsync();
 			return obj.ID;
 		}