diff --git a/app/Http/Controllers/TorrentController.php b/app/Http/Controllers/TorrentController.php
index f2e8e9c50..e6321c690 100644
--- a/app/Http/Controllers/TorrentController.php
+++ b/app/Http/Controllers/TorrentController.php
@@ -100,13 +100,14 @@ class TorrentController extends Controller
             ->findOrFail($id);
 
         $meta = null;
+        $pornMeta = null;
 
         if ($torrent->category->tv_meta && $torrent->tmdb_tv_id) {
             $meta = TmdbTv::with([
                 'genres',
                 'credits' => ['person', 'occupation'],
-                'companies',
                 'networks',
+                'companies',
                 'recommendedTv' => fn ($query) => $query
                     ->select('tmdb_tv.id', 'tmdb_tv.name', 'tmdb_tv.poster', 'tmdb_tv.first_air_date')
                     ->withMin('torrents', 'category_id')
@@ -140,6 +141,17 @@ class TorrentController extends Controller
                 ->find($torrent->igdb);
         }
 
+        // Porn meta logic
+        if ($torrent->category->porn_meta) {
+            if ($torrent->theporndb_scene_id) {
+                $pornMeta = \App\Models\ThePornDbSceneMeta::where('theporndb_scene_id', $torrent->theporndb_scene_id)->first();
+            } elseif ($torrent->theporndb_movie_id) {
+                $pornMeta = \App\Models\PornMovieMeta::where('theporndb_movie_id', $torrent->theporndb_movie_id)->first();
+            } elseif ($torrent->theporndb_jav_id) {
+                $pornMeta = \App\Models\PornJavMeta::where('theporndb_jav_id', $torrent->theporndb_jav_id)->first();
+            }
+        }
+
         return view('torrent.show', [
             'torrent' => $torrent,
             'user'    => $user,
@@ -154,6 +166,7 @@ class TorrentController extends Controller
                 ),
             'personal_freeleech' => cache()->get('personal_freeleech:'.$user->id),
             'meta'               => $meta,
+            'pornMeta'           => $pornMeta,
             'total_tips'         => $torrent->tips()->sum('bon'),
             'user_tips'          => $torrent->tips()->where('sender_id', '=', $user->id)->sum('bon'),
             'mediaInfo'          => $torrent->mediainfo !== null ? (new MediaInfo())->parse($torrent->mediainfo) : null,
diff --git a/resources/views/torrent/edit.blade.php b/resources/views/torrent/edit.blade.php
index 0c0465242..fc4ae8889 100644
--- a/resources/views/torrent/edit.blade.php
+++ b/resources/views/torrent/edit.blade.php
@@ -131,7 +131,7 @@
                                     class="form__text"
                                     placeholder=" "
                                     x-bind:value="scene_exists_on_theporndb ? '{{ old('theporndb_scene_id', $torrent->theporndb_scene_id) }}' : ''"
-                                    :required="scene_exists_on_theporndb"
+                                    :required="cats[cat].type === 'porn' && scene_exists_on_theporndb"
                                 />
                                 <label class="form__label form__label--floating" for="auto_theporndb_scene">
                                     ThePornDB Scene ID
@@ -163,7 +163,7 @@
                                     class="form__text"
                                     placeholder=" "
                                     x-bind:value="movie_exists_on_theporndb ? '{{ old('theporndb_movie_id', $torrent->theporndb_movie_id) }}' : ''"
-                                    :required="movie_exists_on_theporndb"
+                                    :required="cats[cat].type === 'porn' && movie_exists_on_theporndb"
                                 />
                                 <label class="form__label form__label--floating" for="auto_theporndb_movie">
                                     ThePornDB Movie ID
@@ -195,7 +195,7 @@
                                     class="form__text"
                                     placeholder=" "
                                     x-bind:value="jav_exists_on_theporndb ? '{{ old('theporndb_jav_id', $torrent->theporndb_jav_id) }}' : ''"
-                                    :required="jav_exists_on_theporndb"
+                                    :required="cats[cat].type === 'porn' && jav_exists_on_theporndb"
                                 />
                                 <label class="form__label form__label--floating" for="auto_theporndb_jav">
                                     ThePornDB JAV ID
@@ -227,7 +227,7 @@
                                     class="form__text"
                                     placeholder=" "
                                     x-bind:value="stashdb_exists ? '{{ old('stashdb_id', $torrent->stashdb_id) }}' : ''"
-                                    :required="stashdb_exists"
+                                    :required="cats[cat].type === 'porn' && stashdb_exists"
                                 />
                                 <label class="form__label form__label--floating" for="auto_stashdb">
                                     StashDB ID
@@ -259,7 +259,7 @@
                                     class="form__text"
                                     placeholder=" "
                                     x-bind:value="fansdb_exists ? '{{ old('fansdb_id', $torrent->fansdb_id) }}' : ''"
-                                    :required="fansdb_exists"
+                                    :required="cats[cat].type === 'porn' && fansdb_exists"
                                 />
                                 <label class="form__label form__label--floating" for="auto_fansdb">
                                     FansDB ID
diff --git a/resources/views/torrent/show.blade.php b/resources/views/torrent/show.blade.php
index b77264e38..a8b43ee63 100644
--- a/resources/views/torrent/show.blade.php
+++ b/resources/views/torrent/show.blade.php
@@ -28,21 +28,20 @@
 
 @section('main')
     @switch(true)
+        @case($torrent->category->porn_meta)
+            @include('torrent.partials.porn-meta', ['category' => $torrent->category, 'meta' => $pornMeta])
+            @break
         @case($torrent->category->movie_meta)
             @include('torrent.partials.movie-meta', ['category' => $torrent->category, 'tmdb' => $torrent->tmdb_movie_id])
-
             @break
         @case($torrent->category->tv_meta)
             @include('torrent.partials.tv-meta', ['category' => $torrent->category, 'tmdb' => $torrent->tmdb_tv_id])
-
             @break
         @case($torrent->category->game_meta)
             @include('torrent.partials.game-meta', ['category' => $torrent->category, 'igdb' => $torrent->igdb])
-
             @break
         @default
             @include('torrent.partials.no-meta', ['category' => $torrent->category])
-
             @break
     @endswitch
     <h1 class="torrent__name">