diff --git a/server/src/api/routes/batch.ts b/server/src/api/routes/batch.ts
index bd6949d6..26fbe3cc 100644
--- a/server/src/api/routes/batch.ts
+++ b/server/src/api/routes/batch.ts
@@ -7,7 +7,7 @@ import { validateRequest } from '@/api/middleware/validation';
 import { getFromContainer } from '@/infrastructure/container/container';
 import { MovieMapper } from '@/resources/movie/mapper';
 import { ShowMapper } from '@/resources/show/mapper';
-import { MovieService } from '@/services/movie/movie';
+import { MovieService } from '@/services/movie/movie-service';
 import { ShowService } from '@/services/show/show-service';
 
 const handleTv = async (ctx: Context) => {
diff --git a/server/src/api/routes/movie.ts b/server/src/api/routes/movie.ts
index 80d7b57c..c2a55a77 100644
--- a/server/src/api/routes/movie.ts
+++ b/server/src/api/routes/movie.ts
@@ -4,7 +4,7 @@ import { Context } from 'koa';
 
 import { getFromContainer } from '@/infrastructure/container/container';
 import { MovieMapper } from '@/resources/movie/mapper';
-import { MovieService } from '@/services/movie/movie';
+import { MovieService } from '@/services/movie/movie-service';
 import { company, discoverMovie } from '@/services/tmdb/movie';
 
 const lookupById = async (ctx: Context) => {
diff --git a/server/src/services/cache/cache-service.ts b/server/src/services/cache/cache-service.ts
index 2a7d9444..57614d57 100644
--- a/server/src/services/cache/cache-service.ts
+++ b/server/src/services/cache/cache-service.ts
@@ -13,7 +13,7 @@ import {
   CommonResourcesResponse,
 } from '@/services/cache/types';
 import { CompanyService } from '@/services/company/company-service';
-import { MovieService } from '@/services/movie/movie';
+import { MovieService } from '@/services/movie/movie-service';
 import { NetworkService } from '@/services/network/network-service';
 import { PersonService } from '@/services/person/person-service';
 import { ShowService } from '@/services/show/show-service';
diff --git a/server/src/services/cron/jobs/resource-cache.ts b/server/src/services/cron/jobs/resource-cache.ts
index cd3758af..733f6918 100644
--- a/server/src/services/cron/jobs/resource-cache.ts
+++ b/server/src/services/cron/jobs/resource-cache.ts
@@ -3,7 +3,7 @@ import { Service } from 'diod';
 import { AgendaCronService } from '@/services/cron/agenda-cron-service';
 import { Jobber } from '@/services/cron/job';
 import { JobCronName } from '@/services/cron/types';
-import { MovieService } from '@/services/movie/movie';
+import { MovieService } from '@/services/movie/movie-service';
 
 @Service()
 export class ResourceCacheJob implements Jobber {
diff --git a/server/src/services/movie/index.ts b/server/src/services/movie/index.ts
index 17b03fef..5b669180 100644
--- a/server/src/services/movie/index.ts
+++ b/server/src/services/movie/index.ts
@@ -1,6 +1,6 @@
 import { ContainerBuilder } from 'diod';
 
-import { MovieService } from '@/services/movie/movie';
+import { MovieService } from '@/services/movie/movie-service';
 import { FanartMovieProvider } from '@/services/movie/provider/fanart/fanart';
 import {
   MovieArtworkProvider,
diff --git a/server/src/services/movie/movie.ts b/server/src/services/movie/movie-service.ts
similarity index 100%
rename from server/src/services/movie/movie.ts
rename to server/src/services/movie/movie-service.ts
diff --git a/server/src/services/movie/provider/tmdb/tmdb.ts b/server/src/services/movie/provider/tmdb/tmdb.ts
index a96d63ce..319118af 100644
--- a/server/src/services/movie/provider/tmdb/tmdb.ts
+++ b/server/src/services/movie/provider/tmdb/tmdb.ts
@@ -114,7 +114,7 @@ export class TmdbMovieProvider implements MovieProvider, MovieTrendingProvider {
           : undefined;
         const images = this.buildArtworkUrls(detailsResult.images);
         return {
-          title: detailsResult.title || '',
+          title: detailsResult.title || detailsResult.original_title || '',
           description: detailsResult.overview || '',
           certification:
             detailsResult.release_dates?.results.find(
diff --git a/server/src/services/person/person-service.ts b/server/src/services/person/person-service.ts
index b5efb378..13d93aa4 100644
--- a/server/src/services/person/person-service.ts
+++ b/server/src/services/person/person-service.ts
@@ -6,7 +6,7 @@ import { Logger } from '@/infrastructure/logger/logger';
 import { PersonEntity } from '@/resources/person/entity';
 import { PersonProps } from '@/resources/person/types';
 import { CacheProvider } from '@/services/cache/cache-provider';
-import { MovieService } from '@/services/movie/movie';
+import { MovieService } from '@/services/movie/movie-service';
 import {
   PersonDetailsProvider,
   PersonTrendingProvider,
diff --git a/server/src/services/scanner/providers/plex.ts b/server/src/services/scanner/providers/plex.ts
index 2278b543..9d193f58 100644
--- a/server/src/services/scanner/providers/plex.ts
+++ b/server/src/services/scanner/providers/plex.ts
@@ -185,6 +185,7 @@ export class PlexScannerProvider implements ScannerProvider {
       if (
         !is.truthy(content.ratingKey) ||
         content.type !== 'show' ||
+        !is.truthy(content.title) ||
         !is.truthy(content.guid) ||
         !is.truthy(content.Guid)
       ) {
@@ -262,6 +263,7 @@ export class PlexScannerProvider implements ScannerProvider {
       if (
         !is.truthy(metadata.ratingKey) ||
         metadata.type !== 'movie' ||
+        !is.truthy(metadata.title) ||
         !is.truthy(metadata.guid) ||
         !is.truthy(metadata.Guid)
       ) {
diff --git a/server/src/services/scanner/scanner-service.ts b/server/src/services/scanner/scanner-service.ts
index 5d984ac5..854426ca 100644
--- a/server/src/services/scanner/scanner-service.ts
+++ b/server/src/services/scanner/scanner-service.ts
@@ -12,7 +12,7 @@ import { MovieEntity } from '@/resources/movie/entity';
 import { MovieRepository } from '@/resources/movie/repository';
 import { ShowEntity } from '@/resources/show/entity';
 import { ShowRepository } from '@/resources/show/repository';
-import { MovieService } from '@/services/movie/movie';
+import { MovieService } from '@/services/movie/movie-service';
 import { ScannerProvider } from '@/services/scanner/provider';
 import { scannerProviders } from '@/services/scanner/providers';
 import { ShowService } from '@/services/show/show-service';
diff --git a/server/src/services/show/show-service.ts b/server/src/services/show/show-service.ts
index 05f69746..6bdd9c65 100644
--- a/server/src/services/show/show-service.ts
+++ b/server/src/services/show/show-service.ts
@@ -68,7 +68,6 @@ export class ShowService {
             return undefined;
           }
           const details = detailsResult.unwrap();
-
           const artworkResult =
             options?.withArtwork && details.providers.tvdb
               ? await this.showArtworkProvider.getArtworkImages(