diff --git a/API.Benchmark/API.Benchmark.csproj b/API.Benchmark/API.Benchmark.csproj
index 38ec425fe..5e6f11345 100644
--- a/API.Benchmark/API.Benchmark.csproj
+++ b/API.Benchmark/API.Benchmark.csproj
@@ -10,8 +10,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
-      <PackageReference Include="BenchmarkDotNet.Annotations" Version="0.14.0" />
+      <PackageReference Include="BenchmarkDotNet" Version="0.15.1" />
+      <PackageReference Include="BenchmarkDotNet.Annotations" Version="0.15.1" />
       <PackageReference Include="NSubstitute" Version="5.3.0" />
     </ItemGroup>
 
diff --git a/UI/Web/src/_tag-card-common.scss b/UI/Web/src/_tag-card-common.scss
index 07f37c2a0..39a1e87fd 100644
--- a/UI/Web/src/_tag-card-common.scss
+++ b/UI/Web/src/_tag-card-common.scss
@@ -5,6 +5,11 @@
   box-shadow: 0 2px 5px rgba(0,0,0,0.2);
   transition: transform 0.2s ease, background 0.3s ease;
   cursor: pointer;
+
+  &.not-selectable:hover {
+    cursor: not-allowed;
+    background-color: var(--bs-card-color, #2c2c2c) !important;
+  }
 }
 
 .tag-card:hover {
diff --git a/UI/Web/src/app/browse/browse-genres/browse-genres.component.html b/UI/Web/src/app/browse/browse-genres/browse-genres.component.html
index 5eef2c91f..8166ef12c 100644
--- a/UI/Web/src/app/browse/browse-genres/browse-genres.component.html
+++ b/UI/Web/src/app/browse/browse-genres/browse-genres.component.html
@@ -19,7 +19,7 @@
     >
       <ng-template #cardItem let-item let-position="idx">
 
-        <div class="tag-card" (click)="openFilter(FilterField.Genres, item.id)">
+        <div class="tag-card" [ngClass]="{'not-selectable': item.seriesCount === 0}" (click)="openFilter(FilterField.Genres, item)">
           <div class="tag-name">{{ item.title }}</div>
           <div class="tag-meta">
             <span>{{t('series-count', {num: item.seriesCount | compactNumber})}}</span>
diff --git a/UI/Web/src/app/browse/browse-genres/browse-genres.component.ts b/UI/Web/src/app/browse/browse-genres/browse-genres.component.ts
index 02c2a8ead..c46795e25 100644
--- a/UI/Web/src/app/browse/browse-genres/browse-genres.component.ts
+++ b/UI/Web/src/app/browse/browse-genres/browse-genres.component.ts
@@ -1,6 +1,6 @@
 import {ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, inject, OnInit} from '@angular/core';
 import {CardDetailLayoutComponent} from "../../cards/card-detail-layout/card-detail-layout.component";
-import {DecimalPipe} from "@angular/common";
+import {DecimalPipe, NgClass} from "@angular/common";
 import {
   SideNavCompanionBarComponent
 } from "../../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component";
@@ -24,7 +24,8 @@ import {Title} from "@angular/platform-browser";
     DecimalPipe,
     SideNavCompanionBarComponent,
     TranslocoDirective,
-    CompactNumberPipe
+    CompactNumberPipe,
+    NgClass
   ],
   templateUrl: './browse-genres.component.html',
   styleUrl: './browse-genres.component.scss',
@@ -62,7 +63,8 @@ export class BrowseGenresComponent implements OnInit {
     });
   }
 
-  openFilter(field: FilterField, value: string | number) {
-    this.filterUtilityService.applyFilter(['all-series'], field, FilterComparison.Equal, `${value}`).subscribe();
+  openFilter(field: FilterField, genre: BrowseGenre) {
+    if (genre.seriesCount === 0) return; // We don't yet have an issue page
+    this.filterUtilityService.applyFilter(['all-series'], field, FilterComparison.Equal, `${genre.id}`).subscribe();
   }
 }
diff --git a/UI/Web/src/app/browse/browse-tags/browse-tags.component.html b/UI/Web/src/app/browse/browse-tags/browse-tags.component.html
index dcd59bb1f..627e05584 100644
--- a/UI/Web/src/app/browse/browse-tags/browse-tags.component.html
+++ b/UI/Web/src/app/browse/browse-tags/browse-tags.component.html
@@ -19,7 +19,7 @@
     >
       <ng-template #cardItem let-item let-position="idx">
 
-        <div class="tag-card" (click)="openFilter(FilterField.Tags, item.id)">
+        <div class="tag-card" [ngClass]="{'not-selectable': item.seriesCount === 0}" (click)="openFilter(FilterField.Tags, item)">
           <div class="tag-name">{{ item.title }}</div>
           <div class="tag-meta">
             <span>{{t('series-count', {num: item.seriesCount | compactNumber})}}</span>
diff --git a/UI/Web/src/app/browse/browse-tags/browse-tags.component.ts b/UI/Web/src/app/browse/browse-tags/browse-tags.component.ts
index 92910b0b9..05abb6300 100644
--- a/UI/Web/src/app/browse/browse-tags/browse-tags.component.ts
+++ b/UI/Web/src/app/browse/browse-tags/browse-tags.component.ts
@@ -1,6 +1,6 @@
 import {ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, inject, OnInit} from '@angular/core';
 import {CardDetailLayoutComponent} from "../../cards/card-detail-layout/card-detail-layout.component";
-import {DecimalPipe} from "@angular/common";
+import {DecimalPipe, NgClass} from "@angular/common";
 import {
   SideNavCompanionBarComponent
 } from "../../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component";
@@ -25,7 +25,8 @@ import {Title} from "@angular/platform-browser";
     DecimalPipe,
     SideNavCompanionBarComponent,
     TranslocoDirective,
-    CompactNumberPipe
+    CompactNumberPipe,
+    NgClass
   ],
   templateUrl: './browse-tags.component.html',
   styleUrl: './browse-tags.component.scss',
@@ -61,7 +62,8 @@ export class BrowseTagsComponent implements OnInit {
     });
   }
 
-  openFilter(field: FilterField, value: string | number) {
-    this.filterUtilityService.applyFilter(['all-series'], field, FilterComparison.Equal, `${value}`).subscribe();
+  openFilter(field: FilterField, tag: BrowseTag) {
+    if (tag.seriesCount === 0) return; // We don't yet have an issue page
+    this.filterUtilityService.applyFilter(['all-series'], field, FilterComparison.Equal, `${tag.id}`).subscribe();
   }
 }