diff --git a/back/src/Kyoo.Abstractions/Kyoo.Abstractions.csproj b/back/src/Kyoo.Abstractions/Kyoo.Abstractions.csproj
index 42effe0d..9a6951ef 100644
--- a/back/src/Kyoo.Abstractions/Kyoo.Abstractions.csproj
+++ b/back/src/Kyoo.Abstractions/Kyoo.Abstractions.csproj
@@ -8,7 +8,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Autofac" Version="7.1.0" />
-		<PackageReference Include="EntityFrameworkCore.Projectables" Version="4.0.1-prebeta" />
+		<PackageReference Include="EntityFrameworkCore.Projectables" Version="4.1.0-prebeta" />
 		<PackageReference Include="JetBrains.Annotations" Version="2023.2.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
diff --git a/back/src/Kyoo.Abstractions/Models/Resources/Episode.cs b/back/src/Kyoo.Abstractions/Models/Resources/Episode.cs
index cb221a21..24638cc9 100644
--- a/back/src/Kyoo.Abstractions/Models/Resources/Episode.cs
+++ b/back/src/Kyoo.Abstractions/Models/Resources/Episode.cs
@@ -157,7 +157,7 @@ namespace Kyoo.Abstractions.Models
 		/// <summary>
 		/// The previous episode that should be seen before viewing this one.
 		/// </summary>
-		[Projectable(UseMemberBody = nameof(_PreviousEpisode))]
+		[Projectable(UseMemberBody = nameof(_PreviousEpisode), OnlyOnInclude = true)]
 		[LoadableRelation] public Episode? PreviousEpisode { get; set; }
 
 		private Episode? _PreviousEpisode => Show!.Episodes!
@@ -173,7 +173,7 @@ namespace Kyoo.Abstractions.Models
 		/// <summary>
 		/// The next episode to watch after this one.
 		/// </summary>
-		[Projectable(UseMemberBody = nameof(_NextEpisode))]
+		[Projectable(UseMemberBody = nameof(_NextEpisode), OnlyOnInclude = true)]
 		[LoadableRelation] public Episode? NextEpisode { get; set; }
 
 		private Episode? _NextEpisode => Show!.Episodes!
diff --git a/back/src/Kyoo.Core/Controllers/Repositories/LocalRepository.cs b/back/src/Kyoo.Core/Controllers/Repositories/LocalRepository.cs
index 120b930b..7133bb63 100644
--- a/back/src/Kyoo.Core/Controllers/Repositories/LocalRepository.cs
+++ b/back/src/Kyoo.Core/Controllers/Repositories/LocalRepository.cs
@@ -273,9 +273,7 @@ namespace Kyoo.Core.Controllers
 		{
 			if (include == null)
 				return query;
-			foreach (string field in include.Fields
-				// TODO: Remove this hotfix
-				.Where(x => x != "NextEpisode" && x != "PreviousEpisode"))
+			foreach (string field in include.Fields)
 				query = query.Include(field);
 			return query;
 		}
diff --git a/back/src/Kyoo.Postgresql/Kyoo.Postgresql.csproj b/back/src/Kyoo.Postgresql/Kyoo.Postgresql.csproj
index 406e4438..64a1fd92 100644
--- a/back/src/Kyoo.Postgresql/Kyoo.Postgresql.csproj
+++ b/back/src/Kyoo.Postgresql/Kyoo.Postgresql.csproj
@@ -7,7 +7,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="EFCore.NamingConventions" Version="7.0.2" />
-		<PackageReference Include="EntityFrameworkCore.Projectables" Version="4.0.1-prebeta" />
+		<PackageReference Include="EntityFrameworkCore.Projectables" Version="4.1.0-prebeta" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.12">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>