diff --git a/src/main/events/catalogue/get-game-shop-details.ts b/src/main/events/catalogue/get-game-shop-details.ts
index d6d27b9c..1a7fc455 100644
--- a/src/main/events/catalogue/get-game-shop-details.ts
+++ b/src/main/events/catalogue/get-game-shop-details.ts
@@ -26,6 +26,8 @@ const getGameShopDetails = async (
   shop: GameShop,
   language: string
 ): Promise<ShopDetailsWithAssets | null> => {
+  if (shop === "custom") return null;
+
   if (shop === "steam") {
     const [cachedData, cachedAssets] = await Promise.all([
       gamesShopCacheSublevel.get(
diff --git a/src/main/events/library/remove-game-from-library.ts b/src/main/events/library/remove-game-from-library.ts
index fbb60ab2..95133c70 100644
--- a/src/main/events/library/remove-game-from-library.ts
+++ b/src/main/events/library/remove-game-from-library.ts
@@ -84,7 +84,7 @@ const removeGameFromLibrary = async (
     await resetShopAssets(gameKey);
   }
 
-  if (game?.remoteId) {
+  if (game.remoteId) {
     HydraApi.delete(`/profile/games/${game.remoteId}`).catch(() => {});
   }
 
diff --git a/src/renderer/src/pages/game-details/game-details-content.tsx b/src/renderer/src/pages/game-details/game-details-content.tsx
index ab51a212..63c4c974 100644
--- a/src/renderer/src/pages/game-details/game-details-content.tsx
+++ b/src/renderer/src/pages/game-details/game-details-content.tsx
@@ -228,7 +228,7 @@ export function GameDetailsContent() {
               </button>
             )}
 
-            {game?.shop !== "custom" && shop && objectId && (
+            {shop !== "custom" && shop && objectId && (
               <GameReviews
                 shop={shop}
                 objectId={objectId}
@@ -241,7 +241,7 @@ export function GameDetailsContent() {
             )}
           </div>
 
-          {game?.shop !== "custom" && <Sidebar />}
+          {shop !== "custom" && <Sidebar />}
         </div>
       </section>
 
diff --git a/src/types/game.types.ts b/src/types/game.types.ts
index ed8fb852..35d537a8 100644
--- a/src/types/game.types.ts
+++ b/src/types/game.types.ts
@@ -1,4 +1,4 @@
-export type GameShop = "steam" | "epic" | "custom";
+export type GameShop = "steam" | "custom";
 
 export type ShortcutLocation = "desktop" | "start_menu";