diff --git a/back/.gitignore b/back/.gitignore
index b6e558c2..906935b3 100644
--- a/back/.gitignore
+++ b/back/.gitignore
@@ -2,6 +2,7 @@ out
 libtranscoder.so
 libtranscoder.dylib
 transcoder.dll
+kyoo_datadir
 
 video
 .env
diff --git a/back/src/Kyoo.Core/Controllers/Repositories/EpisodeRepository.cs b/back/src/Kyoo.Core/Controllers/Repositories/EpisodeRepository.cs
index 153c855d..c9ef4a82 100644
--- a/back/src/Kyoo.Core/Controllers/Repositories/EpisodeRepository.cs
+++ b/back/src/Kyoo.Core/Controllers/Repositories/EpisodeRepository.cs
@@ -152,7 +152,7 @@ namespace Kyoo.Core.Controllers
 		/// <inheritdoc />
 		public override async Task<Episode> Create(Episode obj)
 		{
-			obj.ShowSlug = obj.Show?.Slug ?? _database.Shows.First(x => x.Id == obj.ShowId).Slug;
+			obj.ShowSlug = obj.Show?.Slug ?? (await _database.Shows.FirstAsync(x => x.Id == obj.ShowId)).Slug;
 			await base.Create(obj);
 			_database.Entry(obj).State = EntityState.Added;
 			await _database.SaveChangesAsync(() =>
@@ -176,6 +176,11 @@ namespace Kyoo.Core.Controllers
 				}
 				resource.ShowId = resource.Show.Id;
 			}
+			if (resource.SeasonId == null && resource.SeasonNumber != null)
+			{
+				resource.Season = await _database.Seasons.FirstOrDefaultAsync(x => x.ShowId == resource.ShowId
+					&& x.SeasonNumber == resource.SeasonNumber);
+			}
 		}
 
 		/// <inheritdoc />