rebased on latest development branch

2025-03-16 11:58:11 +01:00
155 changed files with 3451 additions and 4388 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -249,8 +249,7 @@
      "avatar_url": "https://avatars.githubusercontent.com/u/854646?v=4",
      "profile": "http://www.piribisoft.com",
      "contributions": [
-        "doc",
-        "code"
+        "doc"
      ]
    },
    {
@@ -712,141 +711,6 @@
      "contributions": [
        "code"
      ]
-    },
-    {
-      "login": "j0srisk",
-      "name": "Joseph Risk",
-      "avatar_url": "https://avatars.githubusercontent.com/u/18372584?v=4",
-      "profile": "http://josephrisk.com",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Loetwiek",
-      "name": "Loetwiek",
-      "avatar_url": "https://avatars.githubusercontent.com/u/79059734?v=4",
-      "profile": "https://github.com/Loetwiek",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Fuochi",
-      "name": "Fuochi",
-      "avatar_url": "https://avatars.githubusercontent.com/u/4720478?v=4",
-      "profile": "https://github.com/Fuochi",
-      "contributions": [
-        "doc"
-      ]
-    },
-    {
-      "login": "demrich",
-      "name": "David Emrich",
-      "avatar_url": "https://avatars.githubusercontent.com/u/30092389?v=4",
-      "profile": "https://github.com/demrich",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "maxnatamo",
-      "name": "Max T. Kristiansen",
-      "avatar_url": "https://avatars.githubusercontent.com/u/5898152?v=4",
-      "profile": "https://maxtrier.dk",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "DamsDev1",
-      "name": "Damien Fajole",
-      "avatar_url": "https://avatars.githubusercontent.com/u/60252259?v=4",
-      "profile": "https://damsdev.me",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "AhmedNSidd",
-      "name": "Ahmed Siddiqui",
-      "avatar_url": "https://avatars.githubusercontent.com/u/36286128?v=4",
-      "profile": "https://github.com/AhmedNSidd",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "JackW6809",
-      "name": "JackOXI",
-      "avatar_url": "https://avatars.githubusercontent.com/u/53652452?v=4",
-      "profile": "https://github.com/JackW6809",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "StancuFlorin",
-      "name": "Stancu Florin",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1199404?v=4",
-      "profile": "http://indicus.ro",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "lmiklosko",
-      "name": "Lukas Miklosko",
-      "avatar_url": "https://avatars.githubusercontent.com/u/44380311?v=4",
-      "profile": "https://github.com/lmiklosko",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "gauthier-th",
-      "name": "Gauthier",
-      "avatar_url": "https://avatars.githubusercontent.com/u/37781713?v=4",
-      "profile": "https://gauthierth.fr/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "jessielw",
-      "name": "Jessie Wilson",
-      "avatar_url": "https://avatars.githubusercontent.com/u/48299282?v=4",
-      "profile": "http://www.linkedin.com/in/jessielwilson",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "brotaxt",
-      "name": "DominicKo",
-      "avatar_url": "https://avatars.githubusercontent.com/u/25477935?v=4",
-      "profile": "https://github.com/brotaxt",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "corentinnormand",
-      "name": "Corentin Normand",
-      "avatar_url": "https://avatars.githubusercontent.com/u/30508927?v=4",
-      "profile": "https://doctolib.com",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "benbeauchamp7",
-      "name": "Ben Beauchamp",
-      "avatar_url": "https://avatars.githubusercontent.com/u/43358492?v=4",
-      "profile": "https://github.com/benbeauchamp7",
-      "contributions": [
-        "code"
-      ]
    }
  ]
 }
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -98,8 +98,6 @@ jobs:
          push: true
          build-args: |
            COMMIT_TAG=${{ github.sha }}
-            BUILD_VERSION=develop
-            BUILD_DATE=${{ github.event.repository.updated_at }}
          outputs: |
            type=image,push-by-digest=true,name=fallenbagel/jellyseerr,push=true
            type=image,push-by-digest=true,name=ghcr.io/${{ env.OWNER_LC }}/jellyseerr,push=true
--- a/.github/workflows/preview.yml
+++ b/.github/workflows/preview.yml
@@ -33,7 +33,5 @@ jobs:
          push: true
          build-args: |
            COMMIT_TAG=${{ github.sha }}
-            BUILD_VERSION=${{ steps.get_version.outputs.VERSION }}
-            BUILD_DATE=${{ github.event.repository.updated_at }}
          tags: |
            fallenbagel/jellyseerr:${{ steps.get_version.outputs.VERSION }}
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -58,27 +58,12 @@ All help is welcome and greatly appreciated! If you would like to contribute to

   - Be sure to follow both the [code](#contributing-code) and [UI text](#ui-text-style) guidelines.
   - Should you need to update your fork, you can do so by rebasing from `upstream`:
-
     ```bash
     git fetch upstream
     git rebase upstream/develop
     git push origin BRANCH_NAME -f
     ```

-### Helm Chart
-
-Tools Required:
-
- [Helm](https://helm.sh/docs/intro/install/)
- [helm-docs](https://github.com/norwoodj/helm-docs)
-
-Steps:
-
-1. Make the necessary changes.
-2. Test your changes.
-3. Update the `version` in `charts/jellyseerr-chart/Chart.yaml` following [Semantic Versioning (SemVer)](https://semver.org/).
-4. Run the `helm-docs` command to regenerate the chart's README.
-
 ### Contributing Code

 - If you are taking on an existing bug or feature ticket, please comment on the [issue](https://github.com/fallenbagel/jellyseerr/issues) to avoid multiple people working on the same thing.
--- a/13
+++ b/13
@@ -38,17 +38,8 @@ RUN echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json

 FROM node:22-alpine

-# OCI Meta information
-ARG BUILD_DATE
-ARG BUILD_VERSION
-LABEL \
-    org.opencontainers.image.authors="Fallenbagel" \
-    org.opencontainers.image.source="https://github.com/fallenbagel/jellyseerr" \
-    org.opencontainers.image.created=${BUILD_DATE} \
-    org.opencontainers.image.version=${BUILD_VERSION} \
-    org.opencontainers.image.title="Jellyseerr" \
-    org.opencontainers.image.description="Open-source media request and discovery manager for Jellyfin, Plex, and Emby." \
-    org.opencontainers.image.licenses="MIT"
+# Metadata for Github Package Registry
+LABEL org.opencontainers.image.source="https://github.com/Fallenbagel/jellyseerr"

 WORKDIR /app

--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
 <a href="http://translate.jellyseerr.dev/engage/jellyseerr/"><img src="http://translate.jellyseerr.dev/widget/jellyseerr/jellyseerr-frontend/svg-badge.svg" alt="Translation status" /></a>
 <a href="https://github.com/fallenbagel/jellyseerr/blob/develop/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/fallenbagel/jellyseerr"></a>
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-92-orange.svg"/></a>
+<a href="#contributors-"><img alt="All Contributors" src="https://img.shields.io/badge/all_contributors-77-orange.svg"/></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END -->

 **Jellyseerr** is a free and open source software application for managing requests for your media library. It integrates with the media server of your choice: [Jellyfin](https://jellyfin.org), [Plex](https://plex.tv), and [Emby](https://emby.media/). In addition, it integrates with your existing services, such as **[Sonarr](https://sonarr.tv/)**, **[Radarr](https://radarr.video/)**.
@@ -117,7 +117,7 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/davidfdezalcoba"><img src="https://avatars.githubusercontent.com/u/15996018?v=4?s=100" width="100px;" alt="David Fernández Alcoba"/><br /><sub><b>David Fernández Alcoba</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=davidfdezalcoba" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Gauvino"><img src="https://avatars.githubusercontent.com/u/68083474?v=4?s=100" width="100px;" alt="Gauvino"/><br /><sub><b>Gauvino</b></sub></a><br /><a href="#translation-Gauvino" title="Translation">🌍</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/EthanArmbrust"><img src="https://avatars.githubusercontent.com/u/22754714?v=4?s=100" width="100px;" alt="EthanArmbrust"/><br /><sub><b>EthanArmbrust</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=EthanArmbrust" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.piribisoft.com"><img src="https://avatars.githubusercontent.com/u/854646?v=4?s=100" width="100px;" alt="Eduardo"/><br /><sub><b>Eduardo</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=SirMartin" title="Documentation">📖</a> <a href="https://github.com/fallenbagel/jellyseerr/commits?author=SirMartin" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://www.piribisoft.com"><img src="https://avatars.githubusercontent.com/u/854646?v=4?s=100" width="100px;" alt="Eduardo"/><br /><sub><b>Eduardo</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=SirMartin" title="Documentation">📖</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/RickLuiken"><img src="https://avatars.githubusercontent.com/u/34110371?v=4?s=100" width="100px;" alt="RickLuiken"/><br /><sub><b>RickLuiken</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=RickLuiken" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Br33ce"><img src="https://avatars.githubusercontent.com/u/124933490?v=4?s=100" width="100px;" alt="Br33ce"/><br /><sub><b>Br33ce</b></sub></a><br /><a href="#translation-Br33ce" title="Translation">🌍</a></td>
    </tr>
@@ -184,27 +184,6 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
      <td align="center" valign="top" width="14.28%"><a href="http://indicus.ro"><img src="https://avatars.githubusercontent.com/u/1199404?v=4?s=100" width="100px;" alt="Stancu Florin"/><br /><sub><b>Stancu Florin</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=StancuFlorin" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/RankWeis"><img src="https://avatars.githubusercontent.com/u/733691?v=4?s=100" width="100px;" alt="RankWeis"/><br /><sub><b>RankWeis</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=RankWeis" title="Code">💻</a></td>
    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="http://josephrisk.com"><img src="https://avatars.githubusercontent.com/u/18372584?v=4?s=100" width="100px;" alt="Joseph Risk"/><br /><sub><b>Joseph Risk</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=j0srisk" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Loetwiek"><img src="https://avatars.githubusercontent.com/u/79059734?v=4?s=100" width="100px;" alt="Loetwiek"/><br /><sub><b>Loetwiek</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=Loetwiek" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Fuochi"><img src="https://avatars.githubusercontent.com/u/4720478?v=4?s=100" width="100px;" alt="Fuochi"/><br /><sub><b>Fuochi</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=Fuochi" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/demrich"><img src="https://avatars.githubusercontent.com/u/30092389?v=4?s=100" width="100px;" alt="David Emrich"/><br /><sub><b>David Emrich</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=demrich" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://maxtrier.dk"><img src="https://avatars.githubusercontent.com/u/5898152?v=4?s=100" width="100px;" alt="Max T. Kristiansen"/><br /><sub><b>Max T. Kristiansen</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=maxnatamo" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://damsdev.me"><img src="https://avatars.githubusercontent.com/u/60252259?v=4?s=100" width="100px;" alt="Damien Fajole"/><br /><sub><b>Damien Fajole</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=DamsDev1" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/AhmedNSidd"><img src="https://avatars.githubusercontent.com/u/36286128?v=4?s=100" width="100px;" alt="Ahmed Siddiqui"/><br /><sub><b>Ahmed Siddiqui</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=AhmedNSidd" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/JackW6809"><img src="https://avatars.githubusercontent.com/u/53652452?v=4?s=100" width="100px;" alt="JackOXI"/><br /><sub><b>JackOXI</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=JackW6809" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://indicus.ro"><img src="https://avatars.githubusercontent.com/u/1199404?v=4?s=100" width="100px;" alt="Stancu Florin"/><br /><sub><b>Stancu Florin</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=StancuFlorin" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/lmiklosko"><img src="https://avatars.githubusercontent.com/u/44380311?v=4?s=100" width="100px;" alt="Lukas Miklosko"/><br /><sub><b>Lukas Miklosko</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=lmiklosko" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://gauthierth.fr/"><img src="https://avatars.githubusercontent.com/u/37781713?v=4?s=100" width="100px;" alt="Gauthier"/><br /><sub><b>Gauthier</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=gauthier-th" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.linkedin.com/in/jessielwilson"><img src="https://avatars.githubusercontent.com/u/48299282?v=4?s=100" width="100px;" alt="Jessie Wilson"/><br /><sub><b>Jessie Wilson</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=jessielw" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/brotaxt"><img src="https://avatars.githubusercontent.com/u/25477935?v=4?s=100" width="100px;" alt="DominicKo"/><br /><sub><b>DominicKo</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=brotaxt" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://doctolib.com"><img src="https://avatars.githubusercontent.com/u/30508927?v=4?s=100" width="100px;" alt="Corentin Normand"/><br /><sub><b>Corentin Normand</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=corentinnormand" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/benbeauchamp7"><img src="https://avatars.githubusercontent.com/u/43358492?v=4?s=100" width="100px;" alt="Ben Beauchamp"/><br /><sub><b>Ben Beauchamp</b></sub></a><br /><a href="https://github.com/fallenbagel/jellyseerr/commits?author=benbeauchamp7" title="Code">💻</a></td>
-    </tr>
  </tbody>
 </table>

@@ -356,8 +335,6 @@ Thanks goes to these wonderful people from Overseerr ([emoji key](https://allcon
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/AhmedNSidd"><img src="https://avatars.githubusercontent.com/u/36286128?v=4?s=100" width="100px;" alt="Ahmed Siddiqui"/><br /><sub><b>Ahmed Siddiqui</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=AhmedNSidd" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/JackW6809"><img src="https://avatars.githubusercontent.com/u/53652452?v=4?s=100" width="100px;" alt="JackOXI"/><br /><sub><b>JackOXI</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=JackW6809" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="http://indicus.ro"><img src="https://avatars.githubusercontent.com/u/1199404?v=4?s=100" width="100px;" alt="Stancu Florin"/><br /><sub><b>Stancu Florin</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=StancuFlorin" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/lmiklosko"><img src="https://avatars.githubusercontent.com/u/44380311?v=4?s=100" width="100px;" alt="Lukas Miklosko"/><br /><sub><b>Lukas Miklosko</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=lmiklosko" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://gauthierth.fr/"><img src="https://avatars.githubusercontent.com/u/37781713?v=4?s=100" width="100px;" alt="Gauthier"/><br /><sub><b>Gauthier</b></sub></a><br /><a href="https://github.com/sct/overseerr/commits?author=gauthier-th" title="Code">💻</a></td>
    </tr>
  </tbody>
 </table>
--- a/charts/jellyseerr-chart/Chart.yaml
+++ b/charts/jellyseerr-chart/Chart.yaml
@@ -3,8 +3,8 @@ kubeVersion: ">=1.23.0-0"
 name: jellyseerr-chart
 description: Jellyseerr helm chart for Kubernetes
 type: application
-version: 2.3.3
-appVersion: "2.5.2"
+version: 2.3.0
+appVersion: "2.5.0"
 maintainers:
  - name: Jellyseerr
    url: https://github.com/Fallenbagel/jellyseerr
--- a/charts/jellyseerr-chart/README.md
+++ b/charts/jellyseerr-chart/README.md
@@ -1,6 +1,6 @@
 # jellyseerr-chart

-![Version: 2.3.3](https://img.shields.io/badge/Version-2.3.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.2](https://img.shields.io/badge/AppVersion-2.5.2-informational?style=flat-square)
+![Version: 2.3.0](https://img.shields.io/badge/Version-2.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)

 Jellyseerr helm chart for Kubernetes

--- a/charts/jellyseerr-chart/templates/persistentvolumeclaim.yaml
+++ b/charts/jellyseerr-chart/templates/persistentvolumeclaim.yaml
@@ -4,10 +4,6 @@ metadata:
  name: {{ include "jellyseerr.configPersistenceName" . }}
  labels:
    {{- include "jellyseerr.labels" . | nindent 4 }}
-  {{- with .Values.config.persistence.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
 spec:
  {{- with .Values.config.persistence.accessModes }}
  accessModes:
--- a/cypress/config/settings.cypress.json
+++ b/cypress/config/settings.cypress.json
@@ -19,12 +19,11 @@
    "discoverRegion": "",
    "streamingRegion": "",
    "originalLanguage": "",
-    "blacklistedTags": "",
-    "blacklistedTagsLimit": 50,
    "trustProxy": false,
    "mediaServerType": 1,
    "partialRequestsEnabled": true,
    "enableSpecialEpisodes": false,
+    "forceIpv4First": false,
    "locale": "en"
  },
  "plex": {
@@ -139,8 +138,7 @@
        "types": 0,
        "options": {
          "url": "",
-          "token": "",
-          "priority": 0
+          "token": ""
        }
      }
    }
--- a/docs/getting-started/docker.mdx
+++ b/docs/getting-started/docker.mdx
@@ -37,7 +37,7 @@ docker run -d \
  -p 5055:5055 \
  -v /path/to/appdata/config:/app/config \
  --restart unless-stopped \
-  ghcr.io/fallenbagel/jellyseerr
+  fallenbagel/jellyseerr
 ```
 :::tip
 If you are using emby, make sure to set the `JELLYFIN_TYPE` environment variable to `emby`.
@@ -55,7 +55,7 @@ docker stop jellyseerr && docker rm Jellyseerr
 ```
 Pull the latest image:
 ```bash
-docker pull ghcr.io/fallenbagel/jellyseerr
+docker pull fallenbagel/jellyseerr
 ```
 Finally, run the container with the same parameters originally used to create the container:
 ```bash
@@ -78,7 +78,7 @@ Define the `jellyseerr` service in your `compose.yaml` as follows:
 ---
 services:
  jellyseerr:
-    image: ghcr.io/fallenbagel/jellyseerr:latest
+    image: fallenbagel/jellyseerr:latest
    container_name: jellyseerr
    environment:
      - LOG_LEVEL=debug
@@ -146,7 +146,7 @@ Then, create and start the Jellyseerr container:
 <Tabs groupId="docker-methods" queryString>
  <TabItem value="docker-cli" label="Docker CLI">
 ```bash
-docker run -d --name jellyseerr -e LOG_LEVEL=debug -e TZ=Asia/Tashkent -p 5055:5055 -v "jellyseerr-data:/app/config" --restart unless-stopped ghcr.io/fallenbagel/jellyseerr:latest
+docker run -d --name jellyseerr -e LOG_LEVEL=debug -e TZ=Asia/Tashkent -p 5055:5055 -v "jellyseerr-data:/app/config" --restart unless-stopped fallenbagel/jellyseerr:latest
 ```

 #### Updating:
--- a/docs/troubleshooting.mdx
+++ b/docs/troubleshooting.mdx
@@ -97,7 +97,37 @@ You can try them all and see which one works for your network.
  </TabItem>
 </Tabs>

-### Option 2: Use Jellyseerr through a proxy
+### Option 2: Force IPV4 resolution first
+
+Sometimes there are configuration issues with IPV6 that prevent the hostname resolution from working correctly.
+
+You can try to force the resolution to use IPV4 first by going to `Settings > Networking > Advanced Networking` and enabling `Force IPv4 Resolution First` setting and restarting. You can also add the environment variable, `FORCE_IPV4_FIRST=true`:
+
+<Tabs groupId="methods" queryString>
+  <TabItem value="docker-cli" label="Docker CLI">
+
+Add the following to your `docker run` command:
+```bash
+-e "FORCE_IPV4_FIRST=true"
+```
+
+  </TabItem>
+
+  <TabItem value="docker-compose" label="Docker Compose">
+
+Add the following to your `compose.yaml`:
+```yaml
+---
+services:
+  jellyseerr:
+    environment:
+      - FORCE_IPV4_FIRST=true
+```
+
+  </TabItem>
+</Tabs>
+
+### Option 3: Use Jellyseerr through a proxy

 If you can't change your DNS servers or force IPV4 resolution, you can use Jellyseerr through a proxy.

--- a/docs/using-jellyseerr/settings/general.md
+++ b/docs/using-jellyseerr/settings/general.md
@@ -62,14 +62,6 @@ Set the default display language for Jellyseerr. Users can override this setting

 These settings filter content shown on the "Discover" home page based on regional availability and original language, respectively. The Streaming Region filters the available streaming providers on the media page. Users can override these global settings by configuring these same options in their user settings.

-## Blacklist Content with Tags and Limit Content Blacklisted per Tag
-
-These settings blacklist any TV shows or movies that have one of the entered tags. The "Process Blacklisted Tags" job adds entries to the blacklist based on the configured blacklisted tags. If a blacklisted tag is removed, any media blacklisted under that tag will be removed from the blacklist when the "Process Blacklisted Tags" job runs.
-
-The limit setting determines how many pages per tag the job will process, with each page containing 20 entries. The job cycles through all 16 available discovery sort options, querying the defined number of pages to blacklist media that is most likely to appear at the top of each sort. Higher limits will create a more accurate blacklist, but will require more storage.
-
-Blacklisted tags are disabled until at least one tag is entered. These settings cannot be overridden in user settings.
-
 ## Hide Available Media

 When enabled, media which is already available will not appear on the "Discover" home page, or in the "Recommended" or "Similar" categories or other links on media detail pages.
--- a/jellyseerr-api.yml
+++ b/jellyseerr-api.yml
@@ -191,6 +191,9 @@ components:
        csrfProtection:
          type: boolean
          example: false
+        forceIpv4First:
+          type: boolean
+          example: false
        trustProxy:
          type: boolean
          example: true
@@ -3962,8 +3965,6 @@ paths:
                  type: string
                p256dh:
                  type: string
-                userAgent:
-                  type: string
              required:
                - endpoint
                - auth
@@ -3971,88 +3972,6 @@ paths:
      responses:
        '204':
          description: Successfully registered push subscription
-  /user/{userId}/pushSubscriptions:
-    get:
-      summary: Get all web push notification settings for a user
-      description: |
-        Returns all web push notification settings for a user in a JSON object.
-      tags:
-        - users
-      parameters:
-        - in: path
-          name: userId
-          required: true
-          schema:
-            type: number
-      responses:
-        '200':
-          description: User web push notification settings in JSON
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  endpoint:
-                    type: string
-                  p256dh:
-                    type: string
-                  auth:
-                    type: string
-                  userAgent:
-                    type: string
-  /user/{userId}/pushSubscription/{key}:
-    get:
-      summary: Get web push notification settings for a user
-      description: |
-        Returns web push notification settings for a user in a JSON object.
-      tags:
-        - users
-      parameters:
-        - in: path
-          name: userId
-          required: true
-          schema:
-            type: number
-        - in: path
-          name: key
-          required: true
-          schema:
-            type: string
-      responses:
-        '200':
-          description: User web push notification settings in JSON
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  endpoint:
-                    type: string
-                  p256dh:
-                    type: string
-                  auth:
-                    type: string
-                  userAgent:
-                    type: string
-    delete:
-      summary: Delete user push subscription by key
-      description: Deletes the user push subscription with the provided key.
-      tags:
-        - users
-      parameters:
-        - in: path
-          name: userId
-          required: true
-          schema:
-            type: number
-        - in: path
-          name: key
-          required: true
-          schema:
-            type: string
-      responses:
-        '204':
-          description: Successfully removed user push subscription
  /user/{userId}:
    get:
      summary: Get user by ID
@@ -4239,12 +4158,6 @@ paths:
            type: string
            nullable: true
            example: dune
-        - in: query
-          name: filter
-          schema:
-            type: string
-            enum: [all, manual, blacklistedTags]
-            default: manual
      responses:
        '200':
          description: Blacklisted items returned
--- a/next.config.js
+++ b/next.config.js
@@ -4,6 +4,7 @@
 module.exports = {
  env: {
    commitTag: process.env.COMMIT_TAG || 'local',
+    forceIpv4First: process.env.FORCE_IPV4_FIRST === 'true' ? 'true' : 'false',
  },
  images: {
    remotePatterns: [
--- a/package.json
+++ b/package.json
@@ -44,10 +44,7 @@
    "@svgr/webpack": "6.5.1",
    "@tanem/react-nprogress": "5.0.30",
    "@types/wink-jaro-distance": "^2.0.2",
-    "@types/ua-parser-js": "^0.7.36",
    "ace-builds": "1.15.2",
-    "axios": "1.3.4",
-    "axios-rate-limit": "1.3.0",
    "bcrypt": "5.1.0",
    "bowser": "2.11.0",
    "connect-typeorm": "1.1.4",
@@ -67,7 +64,7 @@
    "gravatar-url": "3.1.0",
    "lodash": "4.17.21",
    "mime": "3",
-    "next": "^14.2.25",
+    "next": "^14.2.24",
    "node-cache": "5.1.2",
    "node-gyp": "9.3.1",
    "node-schedule": "2.1.1",
@@ -102,7 +99,6 @@
    "tailwind-merge": "^2.6.0",
    "typeorm": "0.3.11",
    "undici": "^7.3.0",
-    "ua-parser-js": "^1.0.35",
    "web-push": "3.5.0",
    "wink-jaro-distance": "^2.0.0",
    "winston": "3.8.2",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -41,21 +41,12 @@ importers:
      '@tanem/react-nprogress':
        specifier: 5.0.30
        version: 5.0.30(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
-      '@types/ua-parser-js':
-        specifier: ^0.7.36
-        version: 0.7.39
      '@types/wink-jaro-distance':
        specifier: ^2.0.2
        version: 2.0.2
      ace-builds:
        specifier: 1.15.2
        version: 1.15.2
-      axios:
-        specifier: 1.3.4
-        version: 1.3.4
-      axios-rate-limit:
-        specifier: 1.3.0
-        version: 1.3.0(axios@1.3.4)
      bcrypt:
        specifier: 5.1.0
        version: 5.1.0(encoding@0.1.13)
@@ -114,8 +105,8 @@ importers:
        specifier: '3'
        version: 3.0.0
      next:
-        specifier: ^14.2.25
-        version: 14.2.25(@babel/core@7.24.7)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        specifier: ^14.2.24
+        version: 14.2.24(@babel/core@7.24.7)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
      node-cache:
        specifier: 5.1.2
        version: 5.1.2
@@ -215,9 +206,6 @@ importers:
      typeorm:
        specifier: 0.3.11
        version: 0.3.11(pg@8.11.0)(sqlite3@5.1.7)(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@22.10.5)(typescript@4.9.5))
-      ua-parser-js:
-        specifier: ^1.0.35
-        version: 1.0.40
      undici:
        specifier: ^7.3.0
        version: 7.3.0
@@ -2145,62 +2133,62 @@ packages:
  '@messageformat/runtime@3.0.1':
    resolution: {integrity: sha512-6RU5ol2lDtO8bD9Yxe6CZkl0DArdv0qkuoZC+ZwowU+cdRlVE1157wjCmlA5Rsf1Xc/brACnsZa5PZpEDfTFFg==}

-  '@next/env@14.2.25':
-    resolution: {integrity: sha512-JnzQ2cExDeG7FxJwqAksZ3aqVJrHjFwZQAEJ9gQZSoEhIow7SNoKZzju/AwQ+PLIR4NY8V0rhcVozx/2izDO0w==}
+  '@next/env@14.2.24':
+    resolution: {integrity: sha512-LAm0Is2KHTNT6IT16lxT+suD0u+VVfYNQqM+EJTKuFRRuY2z+zj01kueWXPCxbMBDt0B5vONYzabHGUNbZYAhA==}

  '@next/eslint-plugin-next@14.2.4':
    resolution: {integrity: sha512-svSFxW9f3xDaZA3idQmlFw7SusOuWTpDTAeBlO3AEPDltrraV+lqs7mAc6A27YdnpQVVIA3sODqUAAHdWhVWsA==}

-  '@next/swc-darwin-arm64@14.2.25':
-    resolution: {integrity: sha512-09clWInF1YRd6le00vt750s3m7SEYNehz9C4PUcSu3bAdCTpjIV4aTYQZ25Ehrr83VR1rZeqtKUPWSI7GfuKZQ==}
+  '@next/swc-darwin-arm64@14.2.24':
+    resolution: {integrity: sha512-7Tdi13aojnAZGpapVU6meVSpNzgrFwZ8joDcNS8cJVNuP3zqqrLqeory9Xec5TJZR/stsGJdfwo8KeyloT3+rQ==}
    engines: {node: '>= 10'}
    cpu: [arm64]
    os: [darwin]

-  '@next/swc-darwin-x64@14.2.25':
-    resolution: {integrity: sha512-V+iYM/QR+aYeJl3/FWWU/7Ix4b07ovsQ5IbkwgUK29pTHmq+5UxeDr7/dphvtXEq5pLB/PucfcBNh9KZ8vWbug==}
+  '@next/swc-darwin-x64@14.2.24':
+    resolution: {integrity: sha512-lXR2WQqUtu69l5JMdTwSvQUkdqAhEWOqJEYUQ21QczQsAlNOW2kWZCucA6b3EXmPbcvmHB1kSZDua/713d52xg==}
    engines: {node: '>= 10'}
    cpu: [x64]
    os: [darwin]

-  '@next/swc-linux-arm64-gnu@14.2.25':
-    resolution: {integrity: sha512-LFnV2899PJZAIEHQ4IMmZIgL0FBieh5keMnriMY1cK7ompR+JUd24xeTtKkcaw8QmxmEdhoE5Mu9dPSuDBgtTg==}
+  '@next/swc-linux-arm64-gnu@14.2.24':
+    resolution: {integrity: sha512-nxvJgWOpSNmzidYvvGDfXwxkijb6hL9+cjZx1PVG6urr2h2jUqBALkKjT7kpfurRWicK6hFOvarmaWsINT1hnA==}
    engines: {node: '>= 10'}
    cpu: [arm64]
    os: [linux]

-  '@next/swc-linux-arm64-musl@14.2.25':
-    resolution: {integrity: sha512-QC5y5PPTmtqFExcKWKYgUNkHeHE/z3lUsu83di488nyP0ZzQ3Yse2G6TCxz6nNsQwgAx1BehAJTZez+UQxzLfw==}
+  '@next/swc-linux-arm64-musl@14.2.24':
+    resolution: {integrity: sha512-PaBgOPhqa4Abxa3y/P92F3kklNPsiFjcjldQGT7kFmiY5nuFn8ClBEoX8GIpqU1ODP2y8P6hio6vTomx2Vy0UQ==}
    engines: {node: '>= 10'}
    cpu: [arm64]
    os: [linux]

-  '@next/swc-linux-x64-gnu@14.2.25':
-    resolution: {integrity: sha512-y6/ML4b9eQ2D/56wqatTJN5/JR8/xdObU2Fb1RBidnrr450HLCKr6IJZbPqbv7NXmje61UyxjF5kvSajvjye5w==}
+  '@next/swc-linux-x64-gnu@14.2.24':
+    resolution: {integrity: sha512-vEbyadiRI7GOr94hd2AB15LFVgcJZQWu7Cdi9cWjCMeCiUsHWA0U5BkGPuoYRnTxTn0HacuMb9NeAmStfBCLoQ==}
    engines: {node: '>= 10'}
    cpu: [x64]
    os: [linux]

-  '@next/swc-linux-x64-musl@14.2.25':
-    resolution: {integrity: sha512-sPX0TSXHGUOZFvv96GoBXpB3w4emMqKeMgemrSxI7A6l55VBJp/RKYLwZIB9JxSqYPApqiREaIIap+wWq0RU8w==}
+  '@next/swc-linux-x64-musl@14.2.24':
+    resolution: {integrity: sha512-df0FC9ptaYsd8nQCINCzFtDWtko8PNRTAU0/+d7hy47E0oC17tI54U/0NdGk7l/76jz1J377dvRjmt6IUdkpzQ==}
    engines: {node: '>= 10'}
    cpu: [x64]
    os: [linux]

-  '@next/swc-win32-arm64-msvc@14.2.25':
-    resolution: {integrity: sha512-ReO9S5hkA1DU2cFCsGoOEp7WJkhFzNbU/3VUF6XxNGUCQChyug6hZdYL/istQgfT/GWE6PNIg9cm784OI4ddxQ==}
+  '@next/swc-win32-arm64-msvc@14.2.24':
+    resolution: {integrity: sha512-ZEntbLjeYAJ286eAqbxpZHhDFYpYjArotQ+/TW9j7UROh0DUmX7wYDGtsTPpfCV8V+UoqHBPU7q9D4nDNH014Q==}
    engines: {node: '>= 10'}
    cpu: [arm64]
    os: [win32]

-  '@next/swc-win32-ia32-msvc@14.2.25':
-    resolution: {integrity: sha512-DZ/gc0o9neuCDyD5IumyTGHVun2dCox5TfPQI/BJTYwpSNYM3CZDI4i6TOdjeq1JMo+Ug4kPSMuZdwsycwFbAw==}
+  '@next/swc-win32-ia32-msvc@14.2.24':
+    resolution: {integrity: sha512-9KuS+XUXM3T6v7leeWU0erpJ6NsFIwiTFD5nzNg8J5uo/DMIPvCp3L1Ao5HjbHX0gkWPB1VrKoo/Il4F0cGK2Q==}
    engines: {node: '>= 10'}
    cpu: [ia32]
    os: [win32]

-  '@next/swc-win32-x64-msvc@14.2.25':
-    resolution: {integrity: sha512-KSznmS6eFjQ9RJ1nEc66kJvtGIL1iZMYmGEXsZPh2YtnLtqrgdVvKXJY2ScjjoFnG6nGLyPFR0UiEvDwVah4Tw==}
+  '@next/swc-win32-x64-msvc@14.2.24':
+    resolution: {integrity: sha512-cXcJ2+x0fXQ2CntaE00d7uUH+u1Bfp/E0HsNQH79YiLaZE5Rbm7dZzyAYccn3uICM7mw+DxoMqEfGXZtF4Fgaw==}
    engines: {node: '>= 10'}
    cpu: [x64]
    os: [win32]
@@ -3424,9 +3412,6 @@ packages:
  '@types/triple-beam@1.3.5':
    resolution: {integrity: sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==}

-  '@types/ua-parser-js@0.7.39':
-    resolution: {integrity: sha512-P/oDfpofrdtF5xw433SPALpdSchtJmY7nsJItf8h3KXqOslkbySh8zq4dSWXH2oTjRvJ5PczVEoCZPow6GicLg==}
-
  '@types/unist@2.0.10':
    resolution: {integrity: sha512-IfYcSBWE3hLpBg8+X2SEa8LVkJdJEkT2Ese2aaLs3ptGdVtABxndrMaxuFlQ1qdFf9Q5rDvDpxI3WwgvKFAsQA==}

@@ -3879,14 +3864,6 @@ packages:
    resolution: {integrity: sha512-QbUdXJVTpvUTHU7871ppZkdOLBeGUKBQWHkHrvN2V9IQWGMt61zf3B45BtzjxEJzYuj0JBjBZP/hmYS/R9pmAw==}
    engines: {node: '>=4'}

-  axios-rate-limit@1.3.0:
-    resolution: {integrity: sha512-cKR5wTbU/CeeyF1xVl5hl6FlYsmzDVqxlN4rGtfO5x7J83UxKDckudsW0yW21/ZJRcO0Qrfm3fUFbhEbWTLayw==}
-    peerDependencies:
-      axios: '*'
-
-  axios@1.3.4:
-    resolution: {integrity: sha512-toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ==}
-
  axobject-query@3.1.1:
    resolution: {integrity: sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==}

@@ -5399,15 +5376,6 @@ packages:
  fn.name@1.1.0:
    resolution: {integrity: sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==}

-  follow-redirects@1.15.9:
-    resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      debug: '*'
-    peerDependenciesMeta:
-      debug:
-        optional: true
-
  for-each@0.3.3:
    resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}

@@ -7049,8 +7017,8 @@ packages:
  nerf-dart@1.0.0:
    resolution: {integrity: sha512-EZSPZB70jiVsivaBLYDCyntd5eH8NTSMOn3rB+HxwdmKThGELLdYv8qVIMWvZEFy9w8ZZpW9h9OB32l1rGtj7g==}

-  next@14.2.25:
-    resolution: {integrity: sha512-N5M7xMc4wSb4IkPvEV5X2BRRXUmhVHNyaXwEM86+voXthSZz8ZiRyQW4p9mwAoAPIm6OzuVZtn7idgEJeAJN3Q==}
+  next@14.2.24:
+    resolution: {integrity: sha512-En8VEexSJ0Py2FfVnRRh8gtERwDRaJGNvsvad47ShkC2Yi8AXQPXEA2vKoDJlGFSj5WE5SyF21zNi4M5gyi+SQ==}
    engines: {node: '>=18.17.0'}
    hasBin: true
    peerDependencies:
@@ -7872,9 +7840,6 @@ packages:
  proxy-from-env@1.0.0:
    resolution: {integrity: sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==}

-  proxy-from-env@1.1.0:
-    resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
-
  psl@1.15.0:
    resolution: {integrity: sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==}

@@ -9258,10 +9223,6 @@ packages:
    engines: {node: '>=14.17'}
    hasBin: true

-  ua-parser-js@1.0.40:
-    resolution: {integrity: sha512-z6PJ8Lml+v3ichVojCiB8toQJBuwR42ySM4ezjXIqXK3M0HczmKQ3LF4rhU55PfD99KEEXQG6yb7iOMyvYuHew==}
-    hasBin: true
-
  uc.micro@2.1.0:
    resolution: {integrity: sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==}

@@ -11899,37 +11860,37 @@ snapshots:
    dependencies:
      make-plural: 7.4.0

-  '@next/env@14.2.25': {}
+  '@next/env@14.2.24': {}

  '@next/eslint-plugin-next@14.2.4':
    dependencies:
      glob: 10.3.10

-  '@next/swc-darwin-arm64@14.2.25':
+  '@next/swc-darwin-arm64@14.2.24':
    optional: true

-  '@next/swc-darwin-x64@14.2.25':
+  '@next/swc-darwin-x64@14.2.24':
    optional: true

-  '@next/swc-linux-arm64-gnu@14.2.25':
+  '@next/swc-linux-arm64-gnu@14.2.24':
    optional: true

-  '@next/swc-linux-arm64-musl@14.2.25':
+  '@next/swc-linux-arm64-musl@14.2.24':
    optional: true

-  '@next/swc-linux-x64-gnu@14.2.25':
+  '@next/swc-linux-x64-gnu@14.2.24':
    optional: true

-  '@next/swc-linux-x64-musl@14.2.25':
+  '@next/swc-linux-x64-musl@14.2.24':
    optional: true

-  '@next/swc-win32-arm64-msvc@14.2.25':
+  '@next/swc-win32-arm64-msvc@14.2.24':
    optional: true

-  '@next/swc-win32-ia32-msvc@14.2.25':
+  '@next/swc-win32-ia32-msvc@14.2.24':
    optional: true

-  '@next/swc-win32-x64-msvc@14.2.25':
+  '@next/swc-win32-x64-msvc@14.2.24':
    optional: true

  '@nodelib/fs.scandir@2.1.5':
@@ -13545,7 +13506,7 @@ snapshots:
  '@swc/helpers@0.5.5':
    dependencies:
      '@swc/counter': 0.1.3
-      tslib: 2.8.1
+      tslib: 2.6.3

  '@swc/types@0.1.17':
    dependencies:
@@ -13817,8 +13778,6 @@ snapshots:

  '@types/triple-beam@1.3.5': {}

-  '@types/ua-parser-js@0.7.39': {}
-
  '@types/unist@2.0.10': {}

  '@types/web-push@3.3.2':
@@ -14311,18 +14270,6 @@ snapshots:

  axe-core@4.9.1: {}

-  axios-rate-limit@1.3.0(axios@1.3.4):
-    dependencies:
-      axios: 1.3.4
-
-  axios@1.3.4:
-    dependencies:
-      follow-redirects: 1.15.9
-      form-data: 4.0.2
-      proxy-from-env: 1.1.0
-    transitivePeerDependencies:
-      - debug
-
  axobject-query@3.1.1:
    dependencies:
      deep-equal: 2.2.3
@@ -15685,7 +15632,7 @@ snapshots:
  es-get-iterator@1.1.3:
    dependencies:
      call-bind: 1.0.7
-      get-intrinsic: 1.3.0
+      get-intrinsic: 1.2.4
      has-symbols: 1.0.3
      is-arguments: 1.1.1
      is-map: 2.0.3
@@ -15794,7 +15741,7 @@ snapshots:
      debug: 4.3.5
      enhanced-resolve: 5.17.0
      eslint: 8.35.0
-      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.35.0)(typescript@4.9.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.35.0)(typescript@4.9.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.35.0))(eslint@8.35.0)
+      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.35.0)(typescript@4.9.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.35.0)
      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@5.54.0(eslint@8.35.0)(typescript@4.9.5))(eslint@8.35.0)
      fast-glob: 3.3.2
      get-tsconfig: 4.7.5
@@ -15816,7 +15763,7 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  eslint-module-utils@2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.35.0)(typescript@4.9.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.35.0)(typescript@4.9.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.35.0))(eslint@8.35.0):
+  eslint-module-utils@2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.35.0)(typescript@4.9.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.35.0):
    dependencies:
      debug: 3.2.7(supports-color@8.1.1)
    optionalDependencies:
@@ -16377,8 +16324,6 @@ snapshots:

  fn.name@1.1.0: {}

-  follow-redirects@1.15.9: {}
-
  for-each@0.3.3:
    dependencies:
      is-callable: 1.2.7
@@ -17153,7 +17098,7 @@ snapshots:
  is-weakset@2.0.3:
    dependencies:
      call-bind: 1.0.7
-      get-intrinsic: 1.3.0
+      get-intrinsic: 1.2.4

  is-windows@1.0.2: {}

@@ -18344,27 +18289,27 @@ snapshots:

  nerf-dart@1.0.0: {}

-  next@14.2.25(@babel/core@7.24.7)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
+  next@14.2.24(@babel/core@7.24.7)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
    dependencies:
-      '@next/env': 14.2.25
+      '@next/env': 14.2.24
      '@swc/helpers': 0.5.5
      busboy: 1.6.0
-      caniuse-lite: 1.0.30001700
+      caniuse-lite: 1.0.30001636
      graceful-fs: 4.2.11
      postcss: 8.4.31
      react: 18.3.1
      react-dom: 18.3.1(react@18.3.1)
      styled-jsx: 5.1.1(@babel/core@7.24.7)(react@18.3.1)
    optionalDependencies:
-      '@next/swc-darwin-arm64': 14.2.25
-      '@next/swc-darwin-x64': 14.2.25
-      '@next/swc-linux-arm64-gnu': 14.2.25
-      '@next/swc-linux-arm64-musl': 14.2.25
-      '@next/swc-linux-x64-gnu': 14.2.25
-      '@next/swc-linux-x64-musl': 14.2.25
-      '@next/swc-win32-arm64-msvc': 14.2.25
-      '@next/swc-win32-ia32-msvc': 14.2.25
-      '@next/swc-win32-x64-msvc': 14.2.25
+      '@next/swc-darwin-arm64': 14.2.24
+      '@next/swc-darwin-x64': 14.2.24
+      '@next/swc-linux-arm64-gnu': 14.2.24
+      '@next/swc-linux-arm64-musl': 14.2.24
+      '@next/swc-linux-x64-gnu': 14.2.24
+      '@next/swc-linux-x64-musl': 14.2.24
+      '@next/swc-win32-arm64-msvc': 14.2.24
+      '@next/swc-win32-ia32-msvc': 14.2.24
+      '@next/swc-win32-x64-msvc': 14.2.24
    transitivePeerDependencies:
      - '@babel/core'
      - babel-plugin-macros
@@ -19055,8 +19000,6 @@ snapshots:

  proxy-from-env@1.0.0: {}

-  proxy-from-env@1.1.0: {}
-
  psl@1.15.0:
    dependencies:
      punycode: 2.3.1
@@ -19567,7 +19510,7 @@ snapshots:
      define-properties: 1.2.1
      es-abstract: 1.23.3
      es-errors: 1.3.0
-      get-intrinsic: 1.3.0
+      get-intrinsic: 1.2.4
      globalthis: 1.0.4
      which-builtin-type: 1.1.3

@@ -20729,8 +20672,6 @@ snapshots:

  typescript@5.5.2: {}

-  ua-parser-js@1.0.40: {}
-
  uc.micro@2.1.0:
    optional: true

--- a/server/api/animelist.ts
+++ b/server/api/animelist.ts
@@ -1,7 +1,8 @@
 import logger from '@server/logger';
-import axios from 'axios';
-import fs, { promises as fsp } from 'fs';
-import path from 'path';
+import fs, { promises as fsp } from 'node:fs';
+import path from 'node:path';
+import { Readable } from 'node:stream';
+import type { ReadableStream } from 'node:stream/web';
 import xml2js from 'xml2js';

 const UPDATE_INTERVAL_MSEC = 24 * 3600 * 1000; // how often to download new mapping in milliseconds
@@ -161,14 +162,18 @@ class AnimeListMapping {
      label: 'Anime-List Sync',
    });
    try {
-      const response = await axios.get(MAPPING_URL, {
-        responseType: 'stream',
-      });
+      const response = await fetch(MAPPING_URL);
+      if (!response.ok) {
+        throw new Error(`Failed to fetch: ${response.statusText}`);
+      }
      await new Promise<void>((resolve, reject) => {
        const writer = fs.createWriteStream(LOCAL_PATH);
        writer.on('finish', resolve);
        writer.on('error', reject);
-        response.data.pipe(writer);
+        if (!response.body) return reject();
+        Readable.fromWeb(response.body as ReadableStream<Uint8Array>).pipe(
+          writer
+        );
      });
    } catch (e) {
      throw new Error(`Failed to download Anime-List mapping: ${e.message}`);
--- a/server/api/externalapi.ts
+++ b/server/api/externalapi.ts
@@ -1,6 +1,7 @@
-import type { AxiosInstance, AxiosRequestConfig } from 'axios';
-import axios from 'axios';
-import rateLimit from 'axios-rate-limit';
+import { MediaServerType } from '@server/constants/server';
+import { getSettings } from '@server/lib/settings';
+import type { RateLimitOptions } from '@server/utils/rateLimit';
+import rateLimit from '@server/utils/rateLimit';
 import type NodeCache from 'node-cache';

 // 5 minute default TTL (in seconds)
@@ -12,75 +13,109 @@ const DEFAULT_ROLLING_BUFFER = 10000;
 interface ExternalAPIOptions {
  nodeCache?: NodeCache;
  headers?: Record<string, unknown>;
-  rateLimit?: {
-    maxRPS: number;
-    maxRequests: number;
-  };
+  rateLimit?: RateLimitOptions;
 }

 class ExternalAPI {
-  protected axios: AxiosInstance;
+  protected fetch: typeof fetch;
+  protected params: Record<string, string>;
+  protected defaultHeaders: { [key: string]: string };
  private baseUrl: string;
  private cache?: NodeCache;

  constructor(
    baseUrl: string,
-    params: Record<string, unknown>,
+    params: Record<string, string> = {},
    options: ExternalAPIOptions = {}
  ) {
-    this.axios = axios.create({
-      baseURL: baseUrl,
-      params,
-      headers: {
-        'Content-Type': 'application/json',
-        Accept: 'application/json',
-        ...options.headers,
-      },
-    });
-
    if (options.rateLimit) {
-      this.axios = rateLimit(this.axios, {
-        maxRequests: options.rateLimit.maxRequests,
-        maxRPS: options.rateLimit.maxRPS,
-      });
+      this.fetch = rateLimit(fetch, options.rateLimit);
+    } else {
+      this.fetch = fetch;
+    }
+
+    const url = new URL(baseUrl);
+
+    const settings = getSettings();
+
+    this.defaultHeaders = {
+      'Content-Type': 'application/json',
+      Accept: 'application/json',
+      ...((url.username || url.password) && {
+        Authorization: `Basic ${Buffer.from(
+          `${url.username}:${url.password}`
+        ).toString('base64')}`,
+      }),
+      ...(settings.main.mediaServerType === MediaServerType.EMBY && {
+        'Accept-Encoding': 'gzip',
+      }),
+      ...options.headers,
+    };
+
+    if (url.username || url.password) {
+      url.username = '';
+      url.password = '';
+      baseUrl = url.toString();
    }

    this.baseUrl = baseUrl;
+    this.params = params;
    this.cache = options.nodeCache;
  }

  protected async get<T>(
    endpoint: string,
-    config?: AxiosRequestConfig,
-    ttl?: number
+    params?: Record<string, string>,
+    ttl?: number,
+    config?: RequestInit
  ): Promise<T> {
+    const headers = { ...this.defaultHeaders, ...config?.headers };
    const cacheKey = this.serializeCacheKey(endpoint, {
-      ...config?.params,
-      headers: config?.headers,
+      ...this.params,
+      ...params,
+      headers,
    });
+
    const cachedItem = this.cache?.get<T>(cacheKey);
    if (cachedItem) {
      return cachedItem;
    }

-    const response = await this.axios.get<T>(endpoint, config);
+    const url = this.formatUrl(endpoint, params);
+    const response = await this.fetch(url, {
+      ...config,
+      headers,
+    });
+    if (!response.ok) {
+      const text = await response.text();
+      throw new Error(
+        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
+        {
+          cause: response,
+        }
+      );
+    }
+    const data = await this.getDataFromResponse(response);

    if (this.cache && ttl !== 0) {
-      this.cache.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
+      this.cache.set(cacheKey, data, ttl ?? DEFAULT_TTL);
    }

-    return response.data;
+    return data;
  }

  protected async post<T>(
    endpoint: string,
    data?: Record<string, unknown>,
-    config?: AxiosRequestConfig,
-    ttl?: number
+    params?: Record<string, string>,
+    ttl?: number,
+    config?: RequestInit
  ): Promise<T> {
+    const headers = { ...this.defaultHeaders, ...config?.headers };
    const cacheKey = this.serializeCacheKey(endpoint, {
-      config: config?.params,
-      ...(data ? { data } : {}),
+      config: { ...this.params, ...params },
+      headers,
+      data,
    });

    const cachedItem = this.cache?.get<T>(cacheKey);
@@ -88,23 +123,115 @@ class ExternalAPI {
      return cachedItem;
    }

-    const response = await this.axios.post<T>(endpoint, data, config);
+    const url = this.formatUrl(endpoint, params);
+    const response = await this.fetch(url, {
+      method: 'POST',
+      ...config,
+      headers,
+      body: data ? JSON.stringify(data) : undefined,
+    });
+    if (!response.ok) {
+      const text = await response.text();
+      throw new Error(
+        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
+        {
+          cause: response,
+        }
+      );
+    }
+    const resData = await this.getDataFromResponse(response);

    if (this.cache && ttl !== 0) {
-      this.cache.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
+      this.cache.set(cacheKey, resData, ttl ?? DEFAULT_TTL);
    }

-    return response.data;
+    return resData;
+  }
+
+  protected async put<T>(
+    endpoint: string,
+    data: Record<string, unknown>,
+    params?: Record<string, string>,
+    ttl?: number,
+    config?: RequestInit
+  ): Promise<T> {
+    const headers = { ...this.defaultHeaders, ...config?.headers };
+    const cacheKey = this.serializeCacheKey(endpoint, {
+      config: { ...this.params, ...params },
+      data,
+      headers,
+    });
+
+    const cachedItem = this.cache?.get<T>(cacheKey);
+    if (cachedItem) {
+      return cachedItem;
+    }
+
+    const url = this.formatUrl(endpoint, params);
+    const response = await this.fetch(url, {
+      method: 'PUT',
+      ...config,
+      headers,
+      body: JSON.stringify(data),
+    });
+    if (!response.ok) {
+      const text = await response.text();
+      throw new Error(
+        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
+        {
+          cause: response,
+        }
+      );
+    }
+    const resData = await this.getDataFromResponse(response);
+
+    if (this.cache && ttl !== 0) {
+      this.cache.set(cacheKey, resData, ttl ?? DEFAULT_TTL);
+    }
+
+    return resData;
+  }
+
+  protected async delete<T>(
+    endpoint: string,
+    params?: Record<string, string>,
+    config?: RequestInit
+  ): Promise<T> {
+    const url = this.formatUrl(endpoint, params);
+    const response = await this.fetch(url, {
+      method: 'DELETE',
+      ...config,
+      headers: {
+        ...this.defaultHeaders,
+        ...config?.headers,
+      },
+    });
+    if (!response.ok) {
+      const text = await response.text();
+      throw new Error(
+        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
+        {
+          cause: response,
+        }
+      );
+    }
+    const data = await this.getDataFromResponse(response);
+
+    return data;
  }

  protected async getRolling<T>(
    endpoint: string,
-    config?: AxiosRequestConfig,
-    ttl?: number
+    params?: Record<string, string>,
+    ttl?: number,
+    config?: RequestInit,
+    overwriteBaseUrl?: string
  ): Promise<T> {
+    const headers = { ...this.defaultHeaders, ...config?.headers };
    const cacheKey = this.serializeCacheKey(endpoint, {
-      ...config?.params,
-      headers: config?.headers,
+      ...this.params,
+      ...params,
+      headers,
    });
    const cachedItem = this.cache?.get<T>(cacheKey);

@@ -116,29 +243,82 @@ class ExternalAPI {
        keyTtl - (ttl ?? DEFAULT_TTL) * 1000 <
        Date.now() - DEFAULT_ROLLING_BUFFER
      ) {
-        this.axios.get<T>(endpoint, config).then((response) => {
-          this.cache?.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
+        const url = this.formatUrl(endpoint, params, overwriteBaseUrl);
+        this.fetch(url, {
+          ...config,
+          headers,
+        }).then(async (response) => {
+          if (!response.ok) {
+            const text = await response.text();
+            throw new Error(
+              `${response.status} ${response.statusText}${
+                text ? ': ' + text : ''
+              }`,
+              {
+                cause: response,
+              }
+            );
+          }
+          const data = await this.getDataFromResponse(response);
+          this.cache?.set(cacheKey, data, ttl ?? DEFAULT_TTL);
        });
      }
      return cachedItem;
    }

-    const response = await this.axios.get<T>(endpoint, config);
+    const url = this.formatUrl(endpoint, params, overwriteBaseUrl);
+    const response = await this.fetch(url, {
+      ...config,
+      headers,
+    });
+    if (!response.ok) {
+      const text = await response.text();
+      throw new Error(
+        `${response.status} ${response.statusText}${text ? ': ' + text : ''}`,
+        {
+          cause: response,
+        }
+      );
+    }
+    const data = await this.getDataFromResponse(response);

-    if (this.cache && ttl !== 0) {
-      this.cache.set(cacheKey, response.data, ttl ?? DEFAULT_TTL);
+    if (this.cache) {
+      this.cache.set(cacheKey, data, ttl ?? DEFAULT_TTL);
    }

-    return response.data;
+    return data;
  }

-  protected removeCache(endpoint: string, options?: Record<string, unknown>) {
+  protected removeCache(endpoint: string, options?: Record<string, string>) {
    const cacheKey = this.serializeCacheKey(endpoint, {
+      ...this.params,
      ...options,
    });
    this.cache?.del(cacheKey);
  }

+  private formatUrl(
+    endpoint: string,
+    params?: Record<string, string>,
+    overwriteBaseUrl?: string
+  ): string {
+    const baseUrl = overwriteBaseUrl || this.baseUrl;
+    const href =
+      baseUrl +
+      (baseUrl.endsWith('/') ? '' : '/') +
+      (endpoint.startsWith('/') ? endpoint.slice(1) : endpoint);
+    const searchParams = new URLSearchParams({
+      ...this.params,
+      ...params,
+    });
+    return (
+      href +
+      (searchParams.toString().length
+        ? '?' + searchParams.toString()
+        : searchParams.toString())
+    );
+  }
+
  private serializeCacheKey(
    endpoint: string,
    options?: Record<string, unknown>
@@ -149,6 +329,29 @@ class ExternalAPI {

    return `${this.baseUrl}${endpoint}${JSON.stringify(options)}`;
  }
+
+  private async getDataFromResponse(response: Response) {
+    const contentType = response.headers.get('Content-Type');
+    if (contentType?.includes('application/json')) {
+      return await response.json();
+    } else if (
+      contentType?.includes('application/xml') ||
+      contentType?.includes('text/html') ||
+      contentType?.includes('text/plain')
+    ) {
+      return await response.text();
+    } else {
+      try {
+        return await response.json();
+      } catch {
+        try {
+          return await response.blob();
+        } catch {
+          return null;
+        }
+      }
+    }
+  }
 }

 export default ExternalAPI;
--- a/server/api/github.ts
+++ b/server/api/github.ts
@@ -1,6 +1,6 @@
+import ExternalAPI from '@server/api/externalapi';
 import cacheManager from '@server/lib/cache';
 import logger from '@server/logger';
-import ExternalAPI from './externalapi';

 interface GitHubRelease {
  url: string;
@@ -67,10 +67,6 @@ class GithubAPI extends ExternalAPI {
      'https://api.github.com',
      {},
      {
-        headers: {
-          'Content-Type': 'application/json',
-          Accept: 'application/json',
-        },
        nodeCache: cacheManager.getCache('github').data,
      }
    );
@@ -85,9 +81,7 @@ class GithubAPI extends ExternalAPI {
      const data = await this.get<GitHubRelease[]>(
        '/repos/fallenbagel/jellyseerr/releases',
        {
-          params: {
-            per_page: take,
-          },
+          per_page: take.toString(),
        }
      );

@@ -112,10 +106,8 @@ class GithubAPI extends ExternalAPI {
      const data = await this.get<GithubCommit[]>(
        '/repos/fallenbagel/jellyseerr/commits',
        {
-          params: {
-            per_page: take,
-            branch,
-          },
+          per_page: take.toString(),
+          branch,
        }
      );

--- a/server/api/jellyfin.ts
+++ b/server/api/jellyfin.ts
@@ -110,18 +110,11 @@ class JellyfinAPI extends ExternalAPI {
    deviceId?: string | null
  ) {
    const settings = getSettings();
-    const safeDeviceId =
-      deviceId && deviceId.length > 0
-        ? deviceId
-        : Buffer.from(`BOT_jellyseerr_fallback_${Date.now()}`).toString(
-            'base64'
-          );
-
    let authHeaderVal: string;
    if (authToken) {
-      authHeaderVal = `MediaBrowser Client="Jellyseerr", Device="Jellyseerr", DeviceId="${safeDeviceId}", Version="${getAppVersion()}", Token="${authToken}"`;
+      authHeaderVal = `MediaBrowser Client="Jellyseerr", Device="Jellyseerr", DeviceId="${deviceId}", Version="${getAppVersion()}", Token="${authToken}"`;
    } else {
-      authHeaderVal = `MediaBrowser Client="Jellyseerr", Device="Jellyseerr", DeviceId="${safeDeviceId}", Version="${getAppVersion()}"`;
+      authHeaderVal = `MediaBrowser Client="Jellyseerr", Device="Jellyseerr", DeviceId="${deviceId}", Version="${getAppVersion()}"`;
    }

    super(
@@ -130,8 +123,6 @@ class JellyfinAPI extends ExternalAPI {
      {
        headers: {
          'X-Emby-Authorization': authHeaderVal,
-          'Content-Type': 'application/json',
-          Accept: 'application/json',
        },
      }
    );
@@ -145,7 +136,7 @@ class JellyfinAPI extends ExternalAPI {
    ClientIP?: string
  ): Promise<JellyfinLoginResponse> {
    const authenticate = async (useHeaders: boolean) => {
-      const headers =
+      const headers: { [key: string]: string } =
        useHeaders && ClientIP ? { 'X-Forwarded-For': ClientIP } : {};

      return this.post<JellyfinLoginResponse>(
@@ -154,6 +145,8 @@ class JellyfinAPI extends ExternalAPI {
          Username,
          Pw: Password,
        },
+        {},
+        undefined,
        { headers }
      );
    };
@@ -163,36 +156,36 @@ class JellyfinAPI extends ExternalAPI {
    } catch (e) {
      logger.debug('Failed to authenticate with headers', {
        label: 'Jellyfin API',
-        error: e.response?.statusText,
+        error: e.cause.message ?? e.cause.statusText,
        ip: ClientIP,
      });

-      if (!e.response?.status) {
+      if (!e.cause.status) {
        throw new ApiError(404, ApiErrorCode.InvalidUrl);
      }

-      if (e.response?.status === 401) {
-        throw new ApiError(e.response?.status, ApiErrorCode.InvalidCredentials);
+      if (e.cause.status === 401) {
+        throw new ApiError(e.cause.status, ApiErrorCode.InvalidCredentials);
      }
    }

    try {
      return await authenticate(false);
    } catch (e) {
-      if (e.response?.status === 401) {
-        throw new ApiError(e.response?.status, ApiErrorCode.InvalidCredentials);
+      if (e.cause.status === 401) {
+        throw new ApiError(e.cause.status, ApiErrorCode.InvalidCredentials);
      }

      logger.error(
-        `Something went wrong while authenticating with the Jellyfin server: ${e.message}`,
+        'Something went wrong while authenticating with the Jellyfin server',
        {
          label: 'Jellyfin API',
-          error: e.response?.status,
+          error: e.cause.message ?? e.cause.statusText,
          ip: ClientIP,
        }
      );

-      throw new ApiError(e.response?.status, ApiErrorCode.Unknown);
+      throw new ApiError(e.cause.status, ApiErrorCode.Unknown);
    }
  }

@@ -207,7 +200,7 @@ class JellyfinAPI extends ExternalAPI {

      return systemInfoResponse;
    } catch (e) {
-      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
    }
  }

@@ -220,11 +213,11 @@ class JellyfinAPI extends ExternalAPI {
      return serverResponse.ServerName;
    } catch (e) {
      logger.error(
-        `Something went wrong while getting the server name from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API', error: e.response?.status }
+        'Something went wrong while getting the server name from the Jellyfin server',
+        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
      );

-      throw new ApiError(e.response?.status, ApiErrorCode.Unknown);
+      throw new ApiError(e.cause?.status, ApiErrorCode.Unknown);
    }
  }

@@ -235,11 +228,11 @@ class JellyfinAPI extends ExternalAPI {
      return { users: userReponse };
    } catch (e) {
      logger.error(
-        `Something went wrong while getting the account from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API', error: e.response?.status }
+        'Something went wrong while getting the account from the Jellyfin server',
+        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
      );

-      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
    }
  }

@@ -251,11 +244,11 @@ class JellyfinAPI extends ExternalAPI {
      return userReponse;
    } catch (e) {
      logger.error(
-        `Something went wrong while getting the account from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API', error: e.response?.status }
+        'Something went wrong while getting the account from the Jellyfin server',
+        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
      );

-      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
    }
  }

@@ -275,10 +268,10 @@ class JellyfinAPI extends ExternalAPI {
        return this.mapLibraries(mediaFolderResponse.Items);
      } catch (e) {
        logger.error(
-          `Something went wrong while getting libraries from the Jellyfin server: ${e.message}`,
+          'Something went wrong while getting libraries from the Jellyfin server',
          {
            label: 'Jellyfin API',
-            error: e.response?.status,
+            error: e.cause.message ?? e.cause.statusText,
          }
        );

@@ -315,20 +308,26 @@ class JellyfinAPI extends ExternalAPI {

  public async getLibraryContents(id: string): Promise<JellyfinLibraryItem[]> {
    try {
-      const libraryItemsResponse = await this.get<any>(
-        `/Items?SortBy=SortName&SortOrder=Ascending&IncludeItemTypes=Series,Movie,Others&Recursive=true&StartIndex=0&ParentId=${id}&collapseBoxSetItems=false`
-      );
+      const libraryItemsResponse = await this.get<any>(`/Items`, {
+        SortBy: 'SortName',
+        SortOrder: 'Ascending',
+        IncludeItemTypes: 'Series,Movie,Others',
+        Recursive: 'true',
+        StartIndex: '0',
+        ParentId: id,
+        collapseBoxSetItems: 'false',
+      });

      return libraryItemsResponse.Items.filter(
        (item: JellyfinLibraryItem) => item.LocationType !== 'Virtual'
      );
    } catch (e) {
      logger.error(
-        `Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API', error: e?.response?.status }
+        'Something went wrong while getting library content from the Jellyfin server',
+        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
      );

-      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
    }
  }

@@ -338,22 +337,27 @@ class JellyfinAPI extends ExternalAPI {
        this.mediaServerType === MediaServerType.JELLYFIN
          ? `/Items/Latest`
          : `/Users/${this.userId}/Items/Latest`;
-      const itemResponse = await this.get<any>(
-        `${endpoint}?Limit=12&ParentId=${id}${
-          this.mediaServerType === MediaServerType.JELLYFIN
-            ? `&userId=${this.userId ?? 'Me'}`
-            : ''
-        }`
-      );
+
+      const baseParams = {
+        Limit: '12',
+        ParentId: id,
+      };
+
+      const params =
+        this.mediaServerType === MediaServerType.JELLYFIN
+          ? { ...baseParams, userId: this.userId ?? `Me` }
+          : baseParams;
+
+      const itemResponse = await this.get<any>(endpoint, params);

      return itemResponse;
    } catch (e) {
      logger.error(
-        `Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API', error: e.response?.status }
+        'Something went wrong while getting library content from the Jellyfin server',
+        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
      );

-      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
    }
  }

@@ -362,25 +366,23 @@ class JellyfinAPI extends ExternalAPI {
  ): Promise<JellyfinLibraryItemExtended | undefined> {
    try {
      const itemResponse = await this.get<JellyfinItemsReponse>(`/Items`, {
-        params: {
-          ids: id,
-          fields: 'ProviderIds,MediaSources,Width,Height,IsHD,DateCreated',
-        },
+        ids: id,
+        fields: 'ProviderIds,MediaSources,Width,Height,IsHD,DateCreated',
      });

      return itemResponse.Items?.[0];
    } catch (e) {
      if (availabilitySync.running) {
-        if (e.response?.status === 500) {
+        if (e.cause?.status === 500) {
          return undefined;
        }
      }

      logger.error(
-        `Something went wrong while getting library content from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API', error: e.response?.status }
+        'Something went wrong while getting library content from the Jellyfin server',
+        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
      );
-      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
    }
  }

@@ -391,11 +393,11 @@ class JellyfinAPI extends ExternalAPI {
      return seasonResponse.Items;
    } catch (e) {
      logger.error(
-        `Something went wrong while getting the list of seasons from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API', error: e.response?.status }
+        'Something went wrong while getting the list of seasons from the Jellyfin server',
+        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
      );

-      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
    }
  }

@@ -405,7 +407,10 @@ class JellyfinAPI extends ExternalAPI {
  ): Promise<JellyfinLibraryItem[]> {
    try {
      const episodeResponse = await this.get<any>(
-        `/Shows/${seriesID}/Episodes?seasonId=${seasonID}`
+        `/Shows/${seriesID}/Episodes`,
+        {
+          seasonId: seasonID,
+        }
      );

      return episodeResponse.Items.filter(
@@ -413,11 +418,11 @@ class JellyfinAPI extends ExternalAPI {
      );
    } catch (e) {
      logger.error(
-        `Something went wrong while getting the list of episodes from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API', error: e.response?.status }
+        'Something went wrong while getting the list of episodes from the Jellyfin server',
+        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
      );

-      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
+      throw new ApiError(e.cause?.status, ApiErrorCode.InvalidAuthToken);
    }
  }

@@ -430,8 +435,8 @@ class JellyfinAPI extends ExternalAPI {
      ).AccessToken;
    } catch (e) {
      logger.error(
-        `Something went wrong while creating an API key from the Jellyfin server: ${e.message}`,
-        { label: 'Jellyfin API', error: e.response?.status }
+        'Something went wrong while creating an API key from the Jellyfin server',
+        { label: 'Jellyfin API', error: e.cause.message ?? e.cause.statusText }
      );

      throw new ApiError(e.response?.status, ApiErrorCode.InvalidAuthToken);
--- a/server/api/plextv.ts
+++ b/server/api/plextv.ts
@@ -1,10 +1,10 @@
+import ExternalAPI from '@server/api/externalapi';
 import type { PlexDevice } from '@server/interfaces/api/plexInterfaces';
 import cacheManager from '@server/lib/cache';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { randomUUID } from 'node:crypto';
 import xml2js from 'xml2js';
-import ExternalAPI from './externalapi';

 interface PlexAccountResponse {
  user: PlexUser;
@@ -143,8 +143,6 @@ class PlexTvAPI extends ExternalAPI {
      {
        headers: {
          'X-Plex-Token': authToken,
-          'Content-Type': 'application/json',
-          Accept: 'application/json',
        },
        nodeCache: cacheManager.getCache('plextv').data,
      }
@@ -155,15 +153,11 @@ class PlexTvAPI extends ExternalAPI {

  public async getDevices(): Promise<PlexDevice[]> {
    try {
-      const devicesResp = await this.axios.get(
-        '/api/resources?includeHttps=1',
-        {
-          transformResponse: [],
-          responseType: 'text',
-        }
-      );
+      const devicesResp = await this.get('/api/resources', {
+        includeHttps: '1',
+      });
      const parsedXml = await xml2js.parseStringPromise(
-        devicesResp.data as DeviceResponse
+        devicesResp as DeviceResponse
      );
      return parsedXml?.MediaContainer?.Device?.map((pxml: DeviceResponse) => ({
        name: pxml.$.name,
@@ -211,11 +205,11 @@ class PlexTvAPI extends ExternalAPI {

  public async getUser(): Promise<PlexUser> {
    try {
-      const account = await this.axios.get<PlexAccountResponse>(
+      const account = await this.get<PlexAccountResponse>(
        '/users/account.json'
      );

-      return account.data.user;
+      return account.user;
    } catch (e) {
      logger.error(
        `Something went wrong while getting the account from plex.tv: ${e.message}`,
@@ -255,13 +249,10 @@ class PlexTvAPI extends ExternalAPI {
  }

  public async getUsers(): Promise<UsersResponse> {
-    const response = await this.axios.get('/api/users', {
-      transformResponse: [],
-      responseType: 'text',
-    });
+    const data = await this.get('/api/users');

    const parsedXml = (await xml2js.parseStringPromise(
-      response.data
+      data as string
    )) as UsersResponse;
    return parsedXml;
  }
@@ -281,26 +272,28 @@ class PlexTvAPI extends ExternalAPI {
        this.authToken
      );

-      const response = await this.axios.get<WatchlistResponse>(
-        '/library/sections/watchlist/all',
+      const params = new URLSearchParams({
+        'X-Plex-Container-Start': offset.toString(),
+        'X-Plex-Container-Size': size.toString(),
+      });
+      const response = await this.fetch(
+        `https://metadata.provider.plex.tv/library/sections/watchlist/all?${params.toString()}`,
        {
-          params: {
-            'X-Plex-Container-Start': offset,
-            'X-Plex-Container-Size': size,
-          },
          headers: {
-            'If-None-Match': cachedWatchlist?.etag,
+            ...this.defaultHeaders,
+            ...(cachedWatchlist?.etag
+              ? { 'If-None-Match': cachedWatchlist.etag }
+              : {}),
          },
-          baseURL: 'https://metadata.provider.plex.tv',
-          validateStatus: (status) => status < 400, // Allow HTTP 304 to return without error
        }
      );
+      const data = (await response.json()) as WatchlistResponse;

      // If we don't recieve HTTP 304, the watchlist has been updated and we need to update the cache.
      if (response.status >= 200 && response.status <= 299) {
        cachedWatchlist = {
-          etag: response.headers.etag,
-          response: response.data,
+          etag: response.headers.get('etag') ?? '',
+          response: data,
        };

        watchlistCache.data.set<PlexWatchlistCache>(
@@ -314,9 +307,10 @@ class PlexTvAPI extends ExternalAPI {
          async (watchlistItem) => {
            const detailedResponse = await this.getRolling<MetadataResponse>(
              `/library/metadata/${watchlistItem.ratingKey}`,
-              {
-                baseURL: 'https://metadata.provider.plex.tv',
-              }
+              {},
+              undefined,
+              {},
+              'https://metadata.provider.plex.tv'
            );

            const metadata = detailedResponse.MediaContainer.Metadata[0];
@@ -367,11 +361,16 @@ class PlexTvAPI extends ExternalAPI {

  public async pingToken() {
    try {
-      const data: { pong: unknown } = await this.get('/api/v2/ping', {
-        headers: {
-          'X-Plex-Client-Identifier': randomUUID(),
-        },
-      });
+      const data: { pong: unknown } = await this.get(
+        '/api/v2/ping',
+        {},
+        undefined,
+        {
+          headers: {
+            'X-Plex-Client-Identifier': randomUUID(),
+          },
+        }
+      );
      if (!data?.pong) {
        throw new Error('No pong response');
      }
--- a/server/api/pushover.ts
+++ b/server/api/pushover.ts
@@ -1,4 +1,4 @@
-import ExternalAPI from './externalapi';
+import ExternalAPI from '@server/api/externalapi';

 interface PushoverSoundsResponse {
  sounds: {
@@ -26,24 +26,13 @@ export const mapSounds = (sounds: {

 class PushoverAPI extends ExternalAPI {
  constructor() {
-    super(
-      'https://api.pushover.net/1',
-      {},
-      {
-        headers: {
-          'Content-Type': 'application/json',
-          Accept: 'application/json',
-        },
-      }
-    );
+    super('https://api.pushover.net/1');
  }

  public async getSounds(appToken: string): Promise<PushoverSound[]> {
    try {
      const data = await this.get<PushoverSoundsResponse>('/sounds.json', {
-        params: {
-          token: appToken,
-        },
+        token: appToken,
      });

      return mapSounds(data.sounds);
--- a/server/api/rating/imdbRadarrProxy.ts
+++ b/server/api/rating/imdbRadarrProxy.ts
@@ -155,13 +155,13 @@ export interface IMDBRating {
 */
 class IMDBRadarrProxy extends ExternalAPI {
  constructor() {
-    super('https://api.radarr.video/v1', {
-      headers: {
-        'Content-Type': 'application/json',
-        Accept: 'application/json',
-      },
-      nodeCache: cacheManager.getCache('imdb').data,
-    });
+    super(
+      'https://api.radarr.video/v1',
+      {},
+      {
+        nodeCache: cacheManager.getCache('imdb').data,
+      }
+    );
  }

  /**
--- a/server/api/rating/rottentomatoes.ts
+++ b/server/api/rating/rottentomatoes.ts
@@ -105,15 +105,12 @@ class RottenTomatoes extends ExternalAPI {
    super(
      'https://79frdp12pn-dsn.algolia.net/1/indexes/*',
      {
-        'x-algolia-agent':
-          'Algolia%20for%20JavaScript%20(4.14.3)%3B%20Browser%20(lite)',
+        'x-algolia-agent': 'Algolia for JavaScript (4.14.3); Browser (lite)',
        'x-algolia-api-key': '175588f6e5f8319b27702e4cc4013561',
        'x-algolia-application-id': '79FRDP12PN',
      },
      {
        headers: {
-          'Content-Type': 'application/json',
-          Accept: 'application/json',
          'x-algolia-usertoken': settings.clientId,
        },
        nodeCache: cacheManager.getCache('rt').data,
--- a/server/api/servarr/base.ts
+++ b/server/api/servarr/base.ts
@@ -113,9 +113,9 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {

  public getSystemStatus = async (): Promise<SystemStatus> => {
    try {
-      const response = await this.axios.get<SystemStatus>('/system/status');
+      const data = await this.get<SystemStatus>('/system/status');

-      return response.data;
+      return data;
    } catch (e) {
      throw new Error(
        `[${this.apiName}] Failed to retrieve system status: ${e.message}`
@@ -157,16 +157,15 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {

  public getQueue = async (): Promise<(QueueItem & QueueItemAppendT)[]> => {
    try {
-      const response = await this.axios.get<QueueResponse<QueueItemAppendT>>(
+      const data = await this.get<QueueResponse<QueueItemAppendT>>(
        `/queue`,
        {
-          params: {
-            includeEpisode: true,
-          },
-        }
+          includeEpisode: 'true',
+        },
+        0
      );

-      return response.data.records;
+      return data.records;
    } catch (e) {
      throw new Error(
        `[${this.apiName}] Failed to retrieve queue: ${e.message}`
@@ -176,9 +175,9 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {

  public getTags = async (): Promise<Tag[]> => {
    try {
-      const response = await this.axios.get<Tag[]>(`/tag`);
+      const data = await this.get<Tag[]>(`/tag`);

-      return response.data;
+      return data;
    } catch (e) {
      throw new Error(
        `[${this.apiName}] Failed to retrieve tags: ${e.message}`
@@ -188,11 +187,11 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {

  public createTag = async ({ label }: { label: string }): Promise<Tag> => {
    try {
-      const response = await this.axios.post<Tag>(`/tag`, {
+      const data = await this.post<Tag>(`/tag`, {
        label,
      });

-      return response.data;
+      return data;
    } catch (e) {
      throw new Error(`[${this.apiName}] Failed to create tag: ${e.message}`);
    }
@@ -207,10 +206,15 @@ class ServarrBase<QueueItemAppendT> extends ExternalAPI {
    options: Record<string, unknown>
  ): Promise<void> {
    try {
-      await this.axios.post(`/command`, {
-        name: commandName,
-        ...options,
-      });
+      await this.post(
+        `/command`,
+        {
+          name: commandName,
+          ...options,
+        },
+        {},
+        0
+      );
    } catch (e) {
      throw new Error(`[${this.apiName}] Failed to run command: ${e.message}`);
    }
--- a/server/api/servarr/radarr.ts
+++ b/server/api/servarr/radarr.ts
@@ -28,39 +28,6 @@ export interface RadarrMovie {
  qualityProfileId: number;
  added: string;
  hasFile: boolean;
-  tags: number[];
-  movieFile?: {
-    id: number;
-    movieId: number;
-    relativePath?: string;
-    path?: string;
-    size: number;
-    dateAdded: string;
-    sceneName?: string;
-    releaseGroup?: string;
-    edition?: string;
-    indexerFlags?: number;
-    mediaInfo: {
-      id: number;
-      audioBitrate: number;
-      audioChannels: number;
-      audioCodec?: string;
-      audioLanguages?: string;
-      audioStreamCount: number;
-      videoBitDepth: number;
-      videoBitrate: number;
-      videoCodec?: string;
-      videoFps: number;
-      videoDynamicRange?: string;
-      videoDynamicRangeType?: string;
-      resolution?: string;
-      runTime?: string;
-      scanType?: string;
-      subtitles?: string;
-    };
-    originalFilePath?: string;
-    qualityCutoffNotMet: boolean;
-  };
 }

 class RadarrAPI extends ServarrBase<{ movieId: number }> {
@@ -70,9 +37,9 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {

  public getMovies = async (): Promise<RadarrMovie[]> => {
    try {
-      const response = await this.axios.get<RadarrMovie[]>('/movie');
+      const data = await this.get<RadarrMovie[]>('/movie');

-      return response.data;
+      return data;
    } catch (e) {
      throw new Error(`[Radarr] Failed to retrieve movies: ${e.message}`);
    }
@@ -80,9 +47,9 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {

  public getMovie = async ({ id }: { id: number }): Promise<RadarrMovie> => {
    try {
-      const response = await this.axios.get<RadarrMovie>(`/movie/${id}`);
+      const data = await this.get<RadarrMovie>(`/movie/${id}`);

-      return response.data;
+      return data;
    } catch (e) {
      throw new Error(`[Radarr] Failed to retrieve movie: ${e.message}`);
    }
@@ -90,17 +57,15 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {

  public async getMovieByTmdbId(id: number): Promise<RadarrMovie> {
    try {
-      const response = await this.axios.get<RadarrMovie[]>('/movie/lookup', {
-        params: {
-          term: `tmdb:${id}`,
-        },
+      const data = await this.get<RadarrMovie[]>('/movie/lookup', {
+        term: `tmdb:${id}`,
      });

-      if (!response.data[0]) {
+      if (!data[0]) {
        throw new Error('Movie not found');
      }

-      return response.data[0];
+      return data[0];
    } catch (e) {
      logger.error('Error retrieving movie by TMDB ID', {
        label: 'Radarr API',
@@ -130,7 +95,7 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {

      // movie exists in Radarr but is neither downloaded nor monitored
      if (movie.id && !movie.monitored) {
-        const response = await this.axios.put<RadarrMovie>(`/movie`, {
+        const data = await this.put<RadarrMovie>(`/movie`, {
          ...movie,
          title: options.title,
          qualityProfileId: options.qualityProfileId,
@@ -139,7 +104,7 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
          minimumAvailability: options.minimumAvailability,
          tmdbId: options.tmdbId,
          year: options.year,
-          tags: Array.from(new Set([...movie.tags, ...options.tags])),
+          tags: options.tags,
          rootFolderPath: options.rootFolderPath,
          monitored: options.monitored,
          addOptions: {
@@ -147,25 +112,25 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
          },
        });

-        if (response.data.monitored) {
+        if (data.monitored) {
          logger.info(
            'Found existing title in Radarr and set it to monitored.',
            {
              label: 'Radarr',
-              movieId: response.data.id,
-              movieTitle: response.data.title,
+              movieId: data.id,
+              movieTitle: data.title,
            }
          );
          logger.debug('Radarr update details', {
            label: 'Radarr',
-            movie: response.data,
+            movie: data,
          });

          if (options.searchNow) {
-            this.searchMovie(response.data.id);
+            this.searchMovie(data.id);
          }

-          return response.data;
+          return data;
        } else {
          logger.error('Failed to update existing movie in Radarr.', {
            label: 'Radarr',
@@ -183,7 +148,7 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
        return movie;
      }

-      const response = await this.axios.post<RadarrMovie>(`/movie`, {
+      const data = await this.post<RadarrMovie>(`/movie`, {
        title: options.title,
        qualityProfileId: options.qualityProfileId,
        profileId: options.profileId,
@@ -199,11 +164,11 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
        },
      });

-      if (response.data.id) {
+      if (data.id) {
        logger.info('Radarr accepted request', { label: 'Radarr' });
        logger.debug('Radarr add details', {
          label: 'Radarr',
-          movie: response.data,
+          movie: data,
        });
      } else {
        logger.error('Failed to add movie to Radarr', {
@@ -212,15 +177,22 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
        });
        throw new Error('Failed to add movie to Radarr');
      }
-      return response.data;
+      return data;
    } catch (e) {
+      let errorData;
+      try {
+        errorData = await e.cause?.text();
+        errorData = JSON.parse(errorData);
+      } catch {
+        /* empty */
+      }
      logger.error(
        'Failed to add movie to Radarr. This might happen if the movie already exists, in which case you can safely ignore this error.',
        {
          label: 'Radarr',
          errorMessage: e.message,
          options,
-          response: e?.response?.data,
+          response: errorData,
        }
      );
      throw new Error('Failed to add movie to Radarr');
@@ -249,11 +221,9 @@ class RadarrAPI extends ServarrBase<{ movieId: number }> {
  public removeMovie = async (movieId: number): Promise<void> => {
    try {
      const { id, title } = await this.getMovieByTmdbId(movieId);
-      await this.axios.delete(`/movie/${id}`, {
-        params: {
-          deleteFiles: true,
-          addImportExclusion: false,
-        },
+      await this.delete(`/movie/${id}`, {
+        deleteFiles: 'true',
+        addImportExclusion: 'false',
      });
      logger.info(`[Radarr] Removed movie ${title}`);
    } catch (e) {
--- a/server/api/servarr/sonarr.ts
+++ b/server/api/servarr/sonarr.ts
@@ -117,9 +117,9 @@ class SonarrAPI extends ServarrBase<{

  public async getSeries(): Promise<SonarrSeries[]> {
    try {
-      const response = await this.axios.get<SonarrSeries[]>('/series');
+      const data = await this.get<SonarrSeries[]>('/series');

-      return response.data;
+      return data;
    } catch (e) {
      throw new Error(`[Sonarr] Failed to retrieve series: ${e.message}`);
    }
@@ -127,9 +127,9 @@ class SonarrAPI extends ServarrBase<{

  public async getSeriesById(id: number): Promise<SonarrSeries> {
    try {
-      const response = await this.axios.get<SonarrSeries>(`/series/${id}`);
+      const data = await this.get<SonarrSeries>(`/series/${id}`);

-      return response.data;
+      return data;
    } catch (e) {
      throw new Error(`[Sonarr] Failed to retrieve series by ID: ${e.message}`);
    }
@@ -137,17 +137,15 @@ class SonarrAPI extends ServarrBase<{

  public async getSeriesByTitle(title: string): Promise<SonarrSeries[]> {
    try {
-      const response = await this.axios.get<SonarrSeries[]>('/series/lookup', {
-        params: {
-          term: title,
-        },
+      const data = await this.get<SonarrSeries[]>('/series/lookup', {
+        term: title,
      });

-      if (!response.data[0]) {
+      if (!data[0]) {
        throw new Error('No series found');
      }

-      return response.data;
+      return data;
    } catch (e) {
      logger.error('Error retrieving series by series title', {
        label: 'Sonarr API',
@@ -160,17 +158,15 @@ class SonarrAPI extends ServarrBase<{

  public async getSeriesByTvdbId(id: number): Promise<SonarrSeries> {
    try {
-      const response = await this.axios.get<SonarrSeries[]>('/series/lookup', {
-        params: {
-          term: `tvdb:${id}`,
-        },
+      const data = await this.get<SonarrSeries[]>('/series/lookup', {
+        term: `tvdb:${id}`,
      });

-      if (!response.data[0]) {
+      if (!data[0]) {
        throw new Error('Series not found');
      }

-      return response.data[0];
+      return data[0];
    } catch (e) {
      logger.error('Error retrieving series by tvdb ID', {
        label: 'Sonarr API',
@@ -188,32 +184,30 @@ class SonarrAPI extends ServarrBase<{
      // If the series already exists, we will simply just update it
      if (series.id) {
        series.monitored = options.monitored ?? series.monitored;
-        series.tags = options.tags
-          ? Array.from(new Set([...series.tags, ...options.tags]))
-          : series.tags;
+        series.tags = options.tags ?? series.tags;
        series.seasons = this.buildSeasonList(options.seasons, series.seasons);

-        const newSeriesResponse = await this.axios.put<SonarrSeries>(
+        const newSeriesData = await this.put<SonarrSeries>(
          '/series',
-          series
+          series as any
        );

-        if (newSeriesResponse.data.id) {
+        if (newSeriesData.id) {
          logger.info('Updated existing series in Sonarr.', {
            label: 'Sonarr',
-            seriesId: newSeriesResponse.data.id,
-            seriesTitle: newSeriesResponse.data.title,
+            seriesId: newSeriesData.id,
+            seriesTitle: newSeriesData.title,
          });
          logger.debug('Sonarr update details', {
            label: 'Sonarr',
-            series: newSeriesResponse.data,
+            movie: newSeriesData,
          });

          if (options.searchNow) {
-            this.searchSeries(newSeriesResponse.data.id);
+            this.searchSeries(newSeriesData.id);
          }

-          return newSeriesResponse.data;
+          return newSeriesData;
        } else {
          logger.error('Failed to update series in Sonarr', {
            label: 'Sonarr',
@@ -223,38 +217,35 @@ class SonarrAPI extends ServarrBase<{
        }
      }

-      const createdSeriesResponse = await this.axios.post<SonarrSeries>(
-        '/series',
-        {
-          tvdbId: options.tvdbid,
-          title: options.title,
-          qualityProfileId: options.profileId,
-          languageProfileId: options.languageProfileId,
-          seasons: this.buildSeasonList(
-            options.seasons,
-            series.seasons.map((season) => ({
-              seasonNumber: season.seasonNumber,
-              // We force all seasons to false if its the first request
-              monitored: false,
-            }))
-          ),
-          tags: options.tags,
-          seasonFolder: options.seasonFolder,
-          monitored: options.monitored,
-          rootFolderPath: options.rootFolderPath,
-          seriesType: options.seriesType,
-          addOptions: {
-            ignoreEpisodesWithFiles: true,
-            searchForMissingEpisodes: options.searchNow,
-          },
-        } as Partial<SonarrSeries>
-      );
+      const createdSeriesData = await this.post<SonarrSeries>('/series', {
+        tvdbId: options.tvdbid,
+        title: options.title,
+        qualityProfileId: options.profileId,
+        languageProfileId: options.languageProfileId,
+        seasons: this.buildSeasonList(
+          options.seasons,
+          series.seasons.map((season) => ({
+            seasonNumber: season.seasonNumber,
+            // We force all seasons to false if its the first request
+            monitored: false,
+          }))
+        ),
+        tags: options.tags,
+        seasonFolder: options.seasonFolder,
+        monitored: options.monitored,
+        rootFolderPath: options.rootFolderPath,
+        seriesType: options.seriesType,
+        addOptions: {
+          ignoreEpisodesWithFiles: true,
+          searchForMissingEpisodes: options.searchNow,
+        },
+      } as Partial<SonarrSeries>);

-      if (createdSeriesResponse.data.id) {
+      if (createdSeriesData.id) {
        logger.info('Sonarr accepted request', { label: 'Sonarr' });
        logger.debug('Sonarr add details', {
          label: 'Sonarr',
-          series: createdSeriesResponse.data,
+          movie: createdSeriesData,
        });
      } else {
        logger.error('Failed to add movie to Sonarr', {
@@ -264,13 +255,20 @@ class SonarrAPI extends ServarrBase<{
        throw new Error('Failed to add series to Sonarr');
      }

-      return createdSeriesResponse.data;
+      return createdSeriesData;
    } catch (e) {
+      let errorData;
+      try {
+        errorData = await e.cause?.text();
+        errorData = JSON.parse(errorData);
+      } catch {
+        /* empty */
+      }
      logger.error('Something went wrong while adding a series to Sonarr.', {
        label: 'Sonarr API',
        errorMessage: e.message,
        options,
-        response: e?.response?.data,
+        response: errorData,
      });
      throw new Error('Failed to add series');
    }
@@ -342,14 +340,13 @@ class SonarrAPI extends ServarrBase<{

    return newSeasons;
  }
+
  public removeSerie = async (serieId: number): Promise<void> => {
    try {
      const { id, title } = await this.getSeriesByTvdbId(serieId);
-      await this.axios.delete(`/series/${id}`, {
-        params: {
-          deleteFiles: true,
-          addImportExclusion: false,
-        },
+      await this.delete(`/series/${id}`, {
+        deleteFiles: 'true',
+        addImportExclusion: 'false',
      });
      logger.info(`[Radarr] Removed serie ${title}`);
    } catch (e) {
--- a/server/api/tautulli.ts
+++ b/server/api/tautulli.ts
@@ -1,8 +1,7 @@
+import ExternalAPI from '@server/api/externalapi';
 import type { User } from '@server/entity/User';
 import type { TautulliSettings } from '@server/lib/settings';
 import logger from '@server/logger';
-import type { AxiosInstance } from 'axios';
-import axios from 'axios';
 import { uniqWith } from 'lodash';

 export interface TautulliHistoryRecord {
@@ -113,25 +112,25 @@ interface TautulliInfoResponse {
  };
 }

-class TautulliAPI {
-  private axios: AxiosInstance;
-
+class TautulliAPI extends ExternalAPI {
  constructor(settings: TautulliSettings) {
-    this.axios = axios.create({
-      baseURL: `${settings.useSsl ? 'https' : 'http'}://${settings.hostname}:${
+    super(
+      `${settings.useSsl ? 'https' : 'http'}://${settings.hostname}:${
        settings.port
      }${settings.urlBase ?? ''}`,
-      params: { apikey: settings.apiKey },
-    });
+      {
+        apikey: settings.apiKey || '',
+      }
+    );
  }

  public async getInfo(): Promise<TautulliInfo> {
    try {
      return (
-        await this.axios.get<TautulliInfoResponse>('/api/v2', {
-          params: { cmd: 'get_tautulli_info' },
+        await this.get<TautulliInfoResponse>('/api/v2', {
+          cmd: 'get_tautulli_info',
        })
-      ).data.response.data;
+      ).response.data;
    } catch (e) {
      logger.error('Something went wrong fetching Tautulli server info', {
        label: 'Tautulli API',
@@ -148,14 +147,12 @@ class TautulliAPI {
  ): Promise<TautulliWatchStats[]> {
    try {
      return (
-        await this.axios.get<TautulliWatchStatsResponse>('/api/v2', {
-          params: {
-            cmd: 'get_item_watch_time_stats',
-            rating_key: ratingKey,
-            grouping: 1,
-          },
+        await this.get<TautulliWatchStatsResponse>('/api/v2', {
+          cmd: 'get_item_watch_time_stats',
+          rating_key: ratingKey,
+          grouping: '1',
        })
-      ).data.response.data;
+      ).response.data;
    } catch (e) {
      logger.error(
        'Something went wrong fetching media watch stats from Tautulli',
@@ -176,14 +173,12 @@ class TautulliAPI {
  ): Promise<TautulliWatchUser[]> {
    try {
      return (
-        await this.axios.get<TautulliWatchUsersResponse>('/api/v2', {
-          params: {
-            cmd: 'get_item_user_stats',
-            rating_key: ratingKey,
-            grouping: 1,
-          },
+        await this.get<TautulliWatchUsersResponse>('/api/v2', {
+          cmd: 'get_item_user_stats',
+          rating_key: ratingKey,
+          grouping: '1',
        })
-      ).data.response.data;
+      ).response.data;
    } catch (e) {
      logger.error(
        'Something went wrong fetching media watch users from Tautulli',
@@ -206,15 +201,13 @@ class TautulliAPI {
      }

      return (
-        await this.axios.get<TautulliWatchStatsResponse>('/api/v2', {
-          params: {
-            cmd: 'get_user_watch_time_stats',
-            user_id: user.plexId,
-            query_days: 0,
-            grouping: 1,
-          },
+        await this.get<TautulliWatchStatsResponse>('/api/v2', {
+          cmd: 'get_user_watch_time_stats',
+          user_id: user.plexId.toString(),
+          query_days: '0',
+          grouping: '1',
        })
-      ).data.response.data[0];
+      ).response.data[0];
    } catch (e) {
      logger.error(
        'Something went wrong fetching user watch stats from Tautulli',
@@ -245,19 +238,17 @@ class TautulliAPI {

      while (results.length < 20) {
        const tautulliData = (
-          await this.axios.get<TautulliHistoryResponse>('/api/v2', {
-            params: {
-              cmd: 'get_history',
-              grouping: 1,
-              order_column: 'date',
-              order_dir: 'desc',
-              user_id: user.plexId,
-              media_type: 'movie,episode',
-              length: take,
-              start,
-            },
+          await this.get<TautulliHistoryResponse>('/api/v2', {
+            cmd: 'get_history',
+            grouping: '1',
+            order_column: 'date',
+            order_dir: 'desc',
+            user_id: user.plexId.toString(),
+            media_type: 'movie,episode',
+            length: take.toString(),
+            start: start.toString(),
          })
-        ).data.response.data.data;
+        ).response.data.data;

        if (!tautulliData.length) {
          return results;
--- a/server/api/themoviedb/index.ts
+++ b/server/api/themoviedb/index.ts
@@ -38,26 +38,23 @@ interface SingleSearchOptions extends SearchOptions {
  year?: number;
 }

-export const SortOptionsIterable = [
-  'popularity.desc',
-  'popularity.asc',
-  'release_date.desc',
-  'release_date.asc',
-  'revenue.desc',
-  'revenue.asc',
-  'primary_release_date.desc',
-  'primary_release_date.asc',
-  'original_title.asc',
-  'original_title.desc',
-  'vote_average.desc',
-  'vote_average.asc',
-  'vote_count.desc',
-  'vote_count.asc',
-  'first_air_date.desc',
-  'first_air_date.asc',
-] as const;
-
-export type SortOptions = (typeof SortOptionsIterable)[number];
+export type SortOptions =
+  | 'popularity.asc'
+  | 'popularity.desc'
+  | 'release_date.asc'
+  | 'release_date.desc'
+  | 'revenue.asc'
+  | 'revenue.desc'
+  | 'primary_release_date.asc'
+  | 'primary_release_date.desc'
+  | 'original_title.asc'
+  | 'original_title.desc'
+  | 'vote_average.asc'
+  | 'vote_average.desc'
+  | 'vote_count.asc'
+  | 'vote_count.desc'
+  | 'first_air_date.asc'
+  | 'first_air_date.desc';

 interface DiscoverMovieOptions {
  page?: number;
@@ -118,8 +115,8 @@ class TheMovieDb extends ExternalAPI {
      {
        nodeCache: cacheManager.getCache('tmdb').data,
        rateLimit: {
-          maxRequests: 20,
          maxRPS: 50,
+          id: 'tmdb',
        },
      }
    );
@@ -136,7 +133,10 @@ class TheMovieDb extends ExternalAPI {
  }: SearchOptions): Promise<TmdbSearchMultiResponse> => {
    try {
      const data = await this.get<TmdbSearchMultiResponse>('/search/multi', {
-        params: { query, page, include_adult: includeAdult, language },
+        query,
+        page: page.toString(),
+        include_adult: includeAdult ? 'true' : 'false',
+        language,
      });

      return data;
@@ -159,13 +159,11 @@ class TheMovieDb extends ExternalAPI {
  }: SingleSearchOptions): Promise<TmdbSearchMovieResponse> => {
    try {
      const data = await this.get<TmdbSearchMovieResponse>('/search/movie', {
-        params: {
-          query,
-          page,
-          include_adult: includeAdult,
-          language,
-          primary_release_year: year,
-        },
+        query,
+        page: page.toString(),
+        include_adult: includeAdult ? 'true' : 'false',
+        language,
+        primary_release_year: year?.toString() || '',
      });

      return data;
@@ -188,13 +186,11 @@ class TheMovieDb extends ExternalAPI {
  }: SingleSearchOptions): Promise<TmdbSearchTvResponse> => {
    try {
      const data = await this.get<TmdbSearchTvResponse>('/search/tv', {
-        params: {
-          query,
-          page,
-          include_adult: includeAdult,
-          language,
-          first_air_date_year: year,
-        },
+        query,
+        page: page.toString(),
+        include_adult: includeAdult ? 'true' : 'false',
+        language,
+        first_air_date_year: year?.toString() || '',
      });

      return data;
@@ -217,7 +213,7 @@ class TheMovieDb extends ExternalAPI {
  }): Promise<TmdbPersonDetails> => {
    try {
      const data = await this.get<TmdbPersonDetails>(`/person/${personId}`, {
-        params: { language },
+        language,
      });

      return data;
@@ -237,7 +233,7 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbPersonCombinedCredits>(
        `/person/${personId}/combined_credits`,
        {
-          params: { language },
+          language,
        }
      );

@@ -260,12 +256,10 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbMovieDetails>(
        `/movie/${movieId}`,
        {
-          params: {
-            language,
-            append_to_response:
-              'credits,external_ids,videos,keywords,release_dates,watch/providers',
-            include_video_language: language + ', en',
-          },
+          language,
+          append_to_response:
+            'credits,external_ids,videos,keywords,release_dates,watch/providers',
+          include_video_language: language + ', en',
        },
        43200
      );
@@ -287,12 +281,10 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbTvDetails>(
        `/tv/${tvId}`,
        {
-          params: {
-            language,
-            append_to_response:
-              'aggregate_credits,credits,external_ids,keywords,videos,content_ratings,watch/providers',
-            include_video_language: language + ', en',
-          },
+          language,
+          append_to_response:
+            'aggregate_credits,credits,external_ids,keywords,videos,content_ratings,watch/providers',
+          include_video_language: language + ', en',
        },
        43200
      );
@@ -316,10 +308,8 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbSeasonWithEpisodes>(
        `/tv/${tvId}/season/${seasonNumber}`,
        {
-          params: {
-            language,
-            append_to_response: 'external_ids',
-          },
+          language: language || '',
+          append_to_response: 'external_ids',
        }
      );

@@ -342,10 +332,8 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbSearchMovieResponse>(
        `/movie/${movieId}/recommendations`,
        {
-          params: {
-            page,
-            language,
-          },
+          page: page.toString(),
+          language,
        }
      );

@@ -368,10 +356,8 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbSearchMovieResponse>(
        `/movie/${movieId}/similar`,
        {
-          params: {
-            page,
-            language,
-          },
+          page: page.toString(),
+          language,
        }
      );

@@ -394,10 +380,8 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbSearchMovieResponse>(
        `/keyword/${keywordId}/movies`,
        {
-          params: {
-            page,
-            language,
-          },
+          page: page.toString(),
+          language,
        }
      );

@@ -420,10 +404,8 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbSearchTvResponse>(
        `/tv/${tvId}/recommendations`,
        {
-          params: {
-            page,
-            language,
-          },
+          page: page.toString(),
+          language,
        }
      );

@@ -446,10 +428,8 @@ class TheMovieDb extends ExternalAPI {
  }): Promise<TmdbSearchTvResponse> {
    try {
      const data = await this.get<TmdbSearchTvResponse>(`/tv/${tvId}/similar`, {
-        params: {
-          page,
-          language,
-        },
+        page: page.toString(),
+        language,
      });

      return data;
@@ -490,40 +470,38 @@ class TheMovieDb extends ExternalAPI {
        .split('T')[0];

      const data = await this.get<TmdbSearchMovieResponse>('/discover/movie', {
-        params: {
-          sort_by: sortBy,
-          page,
-          include_adult: includeAdult,
-          language,
-          region: this.discoverRegion || '',
-          with_original_language:
-            originalLanguage && originalLanguage !== 'all'
-              ? originalLanguage
-              : originalLanguage === 'all'
-              ? undefined
-              : this.originalLanguage,
-          // Set our release date values, but check if one is set and not the other,
-          // so we can force a past date or a future date. TMDB Requires both values if one is set!
-          'primary_release_date.gte':
-            !primaryReleaseDateGte && primaryReleaseDateLte
-              ? defaultPastDate
-              : primaryReleaseDateGte,
-          'primary_release_date.lte':
-            !primaryReleaseDateLte && primaryReleaseDateGte
-              ? defaultFutureDate
-              : primaryReleaseDateLte,
-          with_genres: genre,
-          with_companies: studio,
-          with_keywords: keywords,
-          'with_runtime.gte': withRuntimeGte,
-          'with_runtime.lte': withRuntimeLte,
-          'vote_average.gte': voteAverageGte,
-          'vote_average.lte': voteAverageLte,
-          'vote_count.gte': voteCountGte,
-          'vote_count.lte': voteCountLte,
-          watch_region: watchRegion,
-          with_watch_providers: watchProviders,
-        },
+        sort_by: sortBy,
+        page: page.toString(),
+        include_adult: includeAdult ? 'true' : 'false',
+        language,
+        region: this.discoverRegion || '',
+        with_original_language:
+          originalLanguage && originalLanguage !== 'all'
+            ? originalLanguage
+            : originalLanguage === 'all'
+            ? ''
+            : this.originalLanguage || '',
+        // Set our release date values, but check if one is set and not the other,
+        // so we can force a past date or a future date. TMDB Requires both values if one is set!
+        'primary_release_date.gte':
+          !primaryReleaseDateGte && primaryReleaseDateLte
+            ? defaultPastDate
+            : primaryReleaseDateGte || '',
+        'primary_release_date.lte':
+          !primaryReleaseDateLte && primaryReleaseDateGte
+            ? defaultFutureDate
+            : primaryReleaseDateLte || '',
+        with_genres: genre || '',
+        with_companies: studio || '',
+        with_keywords: keywords || '',
+        'with_runtime.gte': withRuntimeGte || '',
+        'with_runtime.lte': withRuntimeLte || '',
+        'vote_average.gte': voteAverageGte || '',
+        'vote_average.lte': voteAverageLte || '',
+        'vote_count.gte': voteCountGte || '',
+        'vote_count.lte': voteCountLte || '',
+        watch_region: watchRegion || '',
+        with_watch_providers: watchProviders || '',
      });

      return data;
@@ -565,41 +543,41 @@ class TheMovieDb extends ExternalAPI {
        .split('T')[0];

      const data = await this.get<TmdbSearchTvResponse>('/discover/tv', {
-        params: {
-          sort_by: sortBy,
-          page,
-          language,
-          region: this.discoverRegion || '',
-          // Set our release date values, but check if one is set and not the other,
-          // so we can force a past date or a future date. TMDB Requires both values if one is set!
-          'first_air_date.gte':
-            !firstAirDateGte && firstAirDateLte
-              ? defaultPastDate
-              : firstAirDateGte,
-          'first_air_date.lte':
-            !firstAirDateLte && firstAirDateGte
-              ? defaultFutureDate
-              : firstAirDateLte,
-          with_original_language:
-            originalLanguage && originalLanguage !== 'all'
-              ? originalLanguage
-              : originalLanguage === 'all'
-              ? undefined
-              : this.originalLanguage,
-          include_null_first_air_dates: includeEmptyReleaseDate,
-          with_genres: genre,
-          with_networks: network,
-          with_keywords: keywords,
-          'with_runtime.gte': withRuntimeGte,
-          'with_runtime.lte': withRuntimeLte,
-          'vote_average.gte': voteAverageGte,
-          'vote_average.lte': voteAverageLte,
-          'vote_count.gte': voteCountGte,
-          'vote_count.lte': voteCountLte,
-          with_watch_providers: watchProviders,
-          watch_region: watchRegion,
-          with_status: withStatus,
-        },
+        sort_by: sortBy,
+        page: page.toString(),
+        language,
+        region: this.discoverRegion || '',
+        // Set our release date values, but check if one is set and not the other,
+        // so we can force a past date or a future date. TMDB Requires both values if one is set!
+        'first_air_date.gte':
+          !firstAirDateGte && firstAirDateLte
+            ? defaultPastDate
+            : firstAirDateGte || '',
+        'first_air_date.lte':
+          !firstAirDateLte && firstAirDateGte
+            ? defaultFutureDate
+            : firstAirDateLte || '',
+        with_original_language:
+          originalLanguage && originalLanguage !== 'all'
+            ? originalLanguage
+            : originalLanguage === 'all'
+            ? ''
+            : this.originalLanguage || '',
+        include_null_first_air_dates: includeEmptyReleaseDate
+          ? 'true'
+          : 'false',
+        with_genres: genre || '',
+        with_networks: network?.toString() || '',
+        with_keywords: keywords || '',
+        'with_runtime.gte': withRuntimeGte || '',
+        'with_runtime.lte': withRuntimeLte || '',
+        'vote_average.gte': voteAverageGte || '',
+        'vote_average.lte': voteAverageLte || '',
+        'vote_count.gte': voteCountGte || '',
+        'vote_count.lte': voteCountLte || '',
+        with_watch_providers: watchProviders || '',
+        watch_region: watchRegion || '',
+        with_status: withStatus || '',
      });

      return data;
@@ -619,12 +597,10 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbUpcomingMoviesResponse>(
        '/movie/upcoming',
        {
-          params: {
-            page,
-            language,
-            region: this.discoverRegion,
-            originalLanguage: this.originalLanguage,
-          },
+          page: page.toString(),
+          language,
+          region: this.discoverRegion || '',
+          originalLanguage: this.originalLanguage || '',
        }
      );

@@ -647,11 +623,9 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbSearchMultiResponse>(
        `/trending/all/${timeWindow}`,
        {
-          params: {
-            page,
-            language,
-            region: this.discoverRegion,
-          },
+          page: page.toString(),
+          language,
+          region: this.discoverRegion || '',
        }
      );

@@ -672,9 +646,7 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbSearchMovieResponse>(
        `/trending/movie/${timeWindow}`,
        {
-          params: {
-            page,
-          },
+          page: page.toString(),
        }
      );

@@ -695,9 +667,7 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbSearchTvResponse>(
        `/trending/tv/${timeWindow}`,
        {
-          params: {
-            page,
-          },
+          page: page.toString(),
        }
      );

@@ -726,10 +696,8 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbExternalIdResponse>(
        `/find/${externalId}`,
        {
-          params: {
-            external_source: type === 'imdb' ? 'imdb_id' : 'tvdb_id',
-            language,
-          },
+          external_source: type === 'imdb' ? 'imdb_id' : 'tvdb_id',
+          language,
        }
      );

@@ -819,9 +787,7 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbCollection>(
        `/collection/${collectionId}`,
        {
-          params: {
-            language,
-          },
+          language,
        }
      );

@@ -894,9 +860,7 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbGenresResult>(
        '/genre/movie/list',
        {
-          params: {
-            language,
-          },
+          language,
        },
        86400 // 24 hours
      );
@@ -908,9 +872,7 @@ class TheMovieDb extends ExternalAPI {
        const englishData = await this.get<TmdbGenresResult>(
          '/genre/movie/list',
          {
-            params: {
-              language: 'en',
-            },
+            language: 'en',
          },
          86400 // 24 hours
        );
@@ -945,9 +907,7 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbGenresResult>(
        '/genre/tv/list',
        {
-          params: {
-            language,
-          },
+          language,
        },
        86400 // 24 hours
      );
@@ -959,9 +919,7 @@ class TheMovieDb extends ExternalAPI {
        const englishData = await this.get<TmdbGenresResult>(
          '/genre/tv/list',
          {
-            params: {
-              language: 'en',
-            },
+            language: 'en',
          },
          86400 // 24 hours
        );
@@ -1016,10 +974,8 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbKeywordSearchResponse>(
        '/search/keyword',
        {
-          params: {
-            query,
-            page,
-          },
+          query,
+          page: page.toString(),
        },
        86400 // 24 hours
      );
@@ -1041,10 +997,8 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<TmdbCompanySearchResponse>(
        '/search/company',
        {
-          params: {
-            query,
-            page,
-          },
+          query,
+          page: page.toString(),
        },
        86400 // 24 hours
      );
@@ -1064,9 +1018,7 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<{ results: TmdbWatchProviderRegion[] }>(
        '/watch/providers/regions',
        {
-          params: {
-            language: language ?? this.originalLanguage,
-          },
+          language: language ? this.originalLanguage || '' : '',
        },
        86400 // 24 hours
      );
@@ -1090,10 +1042,8 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<{ results: TmdbWatchProviderDetails[] }>(
        '/watch/providers/movie',
        {
-          params: {
-            language: language ?? this.originalLanguage,
-            watch_region: watchRegion,
-          },
+          language: language ? this.originalLanguage || '' : '',
+          watch_region: watchRegion,
        },
        86400 // 24 hours
      );
@@ -1117,10 +1067,8 @@ class TheMovieDb extends ExternalAPI {
      const data = await this.get<{ results: TmdbWatchProviderDetails[] }>(
        '/watch/providers/tv',
        {
-          params: {
-            language: language ?? this.originalLanguage,
-            watch_region: watchRegion,
-          },
+          language: language ? this.originalLanguage || '' : '',
+          watch_region: watchRegion,
        },
        86400 // 24 hours
      );
--- a/server/entity/Blacklist.ts
+++ b/server/entity/Blacklist.ts
@@ -1,9 +1,8 @@
 import { MediaStatus, type MediaType } from '@server/constants/media';
-import dataSource from '@server/datasource';
+import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
 import { User } from '@server/entity/User';
 import type { BlacklistItem } from '@server/interfaces/api/blacklistInterfaces';
-import type { EntityManager } from 'typeorm';
 import {
  Column,
  CreateDateColumn,
@@ -36,7 +35,7 @@ export class Blacklist implements BlacklistItem {
  @ManyToOne(() => User, (user) => user.id, {
    eager: true,
  })
-  user?: User;
+  user: User;

  @OneToOne(() => Media, (media) => media.blacklist, {
    onDelete: 'CASCADE',
@@ -44,9 +43,6 @@ export class Blacklist implements BlacklistItem {
  @JoinColumn()
  public media: Media;

-  @Column({ nullable: true, type: 'varchar' })
-  public blacklistedTags?: string;
-
  @CreateDateColumn()
  public createdAt: Date;

@@ -54,32 +50,27 @@ export class Blacklist implements BlacklistItem {
    Object.assign(this, init);
  }

-  public static async addToBlacklist(
-    {
-      blacklistRequest,
-    }: {
-      blacklistRequest: {
-        mediaType: MediaType;
-        title?: ZodOptional<ZodString>['_output'];
-        tmdbId: ZodNumber['_output'];
-        blacklistedTags?: string;
-      };
-    },
-    entityManager?: EntityManager
-  ): Promise<void> {
-    const em = entityManager ?? dataSource;
+  public static async addToBlacklist({
+    blacklistRequest,
+  }: {
+    blacklistRequest: {
+      mediaType: MediaType;
+      title?: ZodOptional<ZodString>['_output'];
+      tmdbId: ZodNumber['_output'];
+    };
+  }): Promise<void> {
    const blacklist = new this({
      ...blacklistRequest,
    });

-    const mediaRepository = em.getRepository(Media);
+    const mediaRepository = getRepository(Media);
    let media = await mediaRepository.findOne({
      where: {
        tmdbId: blacklistRequest.tmdbId,
      },
    });

-    const blacklistRepository = em.getRepository(this);
+    const blacklistRepository = getRepository(this);

    await blacklistRepository.save(blacklist);

--- a/server/entity/MediaRequest.ts
+++ b/server/entity/MediaRequest.ts
@@ -999,7 +999,7 @@ export class MediaRequest {
                radarrMovie.id,
              [this.is4k ? 'externalServiceSlug4k' : 'externalServiceSlug']:
                radarrMovie.titleSlug,
-              [this.is4k ? 'serviceId4k' : 'serviceId']: radarrSettings?.id,
+              [this.is4k ? 'serviceId4k' : 'serviceId']: radarrMovie?.id,
            };

            await mediaRepository.update({ id: this.media.id }, updateFields);
--- a/server/entity/User.ts
+++ b/server/entity/User.ts
@@ -98,12 +98,6 @@ export class User {
  @Column()
  public avatar: string;

-  @Column({ type: 'varchar', nullable: true })
-  public avatarETag?: string | null;
-
-  @Column({ type: 'varchar', nullable: true })
-  public avatarVersion?: string | null;
-
  @RelationCount((user: User) => user.requests)
  public requestCount: number;

--- a/server/entity/UserPushSubscription.ts
+++ b/server/entity/UserPushSubscription.ts
@@ -1,10 +1,4 @@
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  ManyToOne,
-  PrimaryGeneratedColumn,
-} from 'typeorm';
+import { Column, Entity, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
 import { User } from './User';

@Entity()
@@ -24,15 +18,9 @@ export class UserPushSubscription {
  @Column()
  public p256dh: string;

-  @Column()
+  @Column({ unique: true })
  public auth: string;

-  @Column({ nullable: true })
-  public userAgent: string;
-
-  @CreateDateColumn({ nullable: true })
-  public createdAt: Date;
-
  constructor(init?: Partial<UserPushSubscription>) {
    Object.assign(this, init);
  }
--- a/server/index.ts
+++ b/server/index.ts
@@ -35,6 +35,8 @@ import * as OpenApiValidator from 'express-openapi-validator';
 import type { Store } from 'express-session';
 import session from 'express-session';
 import next from 'next';
+import dns from 'node:dns';
+import net from 'node:net';
 import path from 'path';
 import swaggerUi from 'swagger-ui-express';
 import YAML from 'yamljs';
@@ -72,6 +74,15 @@ app
    const settings = await getSettings().load();
    restartFlag.initializeSettings(settings);

+    // Check if we force IPv4 first
+    if (
+      process.env.forceIpv4First === 'true' ||
+      settings.network.forceIpv4First
+    ) {
+      dns.setDefaultResultOrder('ipv4first');
+      net.setDefaultAutoSelectFamily(false);
+    }
+
    // Register HTTP proxy
    if (settings.network.proxy.enabled) {
      await createCustomProxyAgent(settings.network.proxy);
--- a/server/interfaces/api/blacklistInterfaces.ts
+++ b/server/interfaces/api/blacklistInterfaces.ts
@@ -6,8 +6,7 @@ export interface BlacklistItem {
  mediaType: 'movie' | 'tv';
  title?: string;
  createdAt?: Date;
-  user?: User;
-  blacklistedTags?: string;
+  user: User;
 }

 export interface BlacklistResultsResponse extends PaginatedResponse {
--- a/server/interfaces/api/requestInterfaces.ts
+++ b/server/interfaces/api/requestInterfaces.ts
@@ -3,10 +3,7 @@ import type { MediaRequest } from '@server/entity/MediaRequest';
 import type { NonFunctionProperties, PaginatedResponse } from './common';

 export interface RequestResultsResponse extends PaginatedResponse {
-  results: (NonFunctionProperties<MediaRequest> & {
-    profileName?: string;
-    canRemove?: boolean;
-  })[];
+  results: NonFunctionProperties<MediaRequest>[];
 }

 export type MediaRequestBody = {
--- a/server/job/blacklistedTagsProcessor.ts
+++ b/server/job/blacklistedTagsProcessor.ts
@@ -1,184 +0,0 @@
-import type { SortOptions } from '@server/api/themoviedb';
-import { SortOptionsIterable } from '@server/api/themoviedb';
-import type {
-  TmdbSearchMovieResponse,
-  TmdbSearchTvResponse,
-} from '@server/api/themoviedb/interfaces';
-import { MediaType } from '@server/constants/media';
-import dataSource from '@server/datasource';
-import { Blacklist } from '@server/entity/Blacklist';
-import Media from '@server/entity/Media';
-import type {
-  RunnableScanner,
-  StatusBase,
-} from '@server/lib/scanners/baseScanner';
-import { getSettings } from '@server/lib/settings';
-import logger from '@server/logger';
-import { createTmdbWithRegionLanguage } from '@server/routes/discover';
-import type { EntityManager } from 'typeorm';
-
-const TMDB_API_DELAY_MS = 250;
-class AbortTransaction extends Error {}
-
-class BlacklistedTagProcessor implements RunnableScanner<StatusBase> {
-  private running = false;
-  private progress = 0;
-  private total = 0;
-
-  public async run() {
-    this.running = true;
-
-    try {
-      await dataSource.transaction(async (em) => {
-        await this.cleanBlacklist(em);
-        await this.createBlacklistEntries(em);
-      });
-    } catch (err) {
-      if (err instanceof AbortTransaction) {
-        logger.info('Aborting job: Process Blacklisted Tags', {
-          label: 'Jobs',
-        });
-      } else {
-        throw err;
-      }
-    } finally {
-      this.reset();
-    }
-  }
-
-  public status(): StatusBase {
-    return {
-      running: this.running,
-      progress: this.progress,
-      total: this.total,
-    };
-  }
-
-  public cancel() {
-    this.running = false;
-    this.progress = 0;
-    this.total = 0;
-  }
-
-  private reset() {
-    this.cancel();
-  }
-
-  private async createBlacklistEntries(em: EntityManager) {
-    const tmdb = createTmdbWithRegionLanguage();
-
-    const settings = getSettings();
-    const blacklistedTags = settings.main.blacklistedTags;
-    const blacklistedTagsArr = blacklistedTags.split(',');
-
-    const pageLimit = settings.main.blacklistedTagsLimit;
-
-    if (blacklistedTags.length === 0) {
-      return;
-    }
-
-    // The maximum number of queries we're expected to execute
-    this.total =
-      2 * blacklistedTagsArr.length * pageLimit * SortOptionsIterable.length;
-
-    for (const type of [MediaType.MOVIE, MediaType.TV]) {
-      const getDiscover =
-        type === MediaType.MOVIE ? tmdb.getDiscoverMovies : tmdb.getDiscoverTv;
-
-      // Iterate for each tag
-      for (const tag of blacklistedTagsArr) {
-        let queryMax = pageLimit * SortOptionsIterable.length;
-        let fixedSortMode = false; // Set to true when the page limit allows for getting every page of tag
-
-        for (let query = 0; query < queryMax; query++) {
-          const page: number = fixedSortMode
-            ? query + 1
-            : (query % pageLimit) + 1;
-          const sortBy: SortOptions | undefined = fixedSortMode
-            ? undefined
-            : SortOptionsIterable[query % SortOptionsIterable.length];
-
-          if (!this.running) {
-            throw new AbortTransaction();
-          }
-
-          const response = await getDiscover({
-            page,
-            sortBy,
-            keywords: tag,
-          });
-          await this.processResults(response, tag, type, em);
-          await new Promise((res) => setTimeout(res, TMDB_API_DELAY_MS));
-
-          this.progress++;
-          if (page === 1 && response.total_pages <= queryMax) {
-            // We will finish the tag with less queries than expected, move progress accordingly
-            this.progress += queryMax - response.total_pages;
-            fixedSortMode = true;
-            queryMax = response.total_pages;
-          }
-        }
-      }
-    }
-  }
-
-  private async processResults(
-    response: TmdbSearchMovieResponse | TmdbSearchTvResponse,
-    keywordId: string,
-    mediaType: MediaType,
-    em: EntityManager
-  ) {
-    const blacklistRepository = em.getRepository(Blacklist);
-
-    for (const entry of response.results) {
-      const blacklistEntry = await blacklistRepository.findOne({
-        where: { tmdbId: entry.id },
-      });
-
-      if (blacklistEntry) {
-        // Don't mark manual blacklists with tags
-        // If media wasn't previously blacklisted for this tag, add the tag to the media's blacklist
-        if (
-          blacklistEntry.blacklistedTags &&
-          !blacklistEntry.blacklistedTags.includes(`,${keywordId},`)
-        ) {
-          await blacklistRepository.update(blacklistEntry.id, {
-            blacklistedTags: `${blacklistEntry.blacklistedTags}${keywordId},`,
-          });
-        }
-      } else {
-        // Media wasn't previously blacklisted, add it to the blacklist
-        await Blacklist.addToBlacklist(
-          {
-            blacklistRequest: {
-              mediaType,
-              title: 'title' in entry ? entry.title : entry.name,
-              tmdbId: entry.id,
-              blacklistedTags: `,${keywordId},`,
-            },
-          },
-          em
-        );
-      }
-    }
-  }
-
-  private async cleanBlacklist(em: EntityManager) {
-    // Remove blacklist and media entries blacklisted by tags
-    const mediaRepository = em.getRepository(Media);
-    const mediaToRemove = await mediaRepository
-      .createQueryBuilder('media')
-      .innerJoinAndSelect(Blacklist, 'blist', 'blist.tmdbId = media.tmdbId')
-      .where(`blist.blacklistedTags IS NOT NULL`)
-      .getMany();
-
-    // Batch removes so the query doesn't get too large
-    for (let i = 0; i < mediaToRemove.length; i += 500) {
-      await mediaRepository.remove(mediaToRemove.slice(i, i + 500)); // This also deletes the blacklist entries via cascading
-    }
-  }
-}
-
-const blacklistedTagsProcessor = new BlacklistedTagProcessor();
-
-export default blacklistedTagsProcessor;
--- a/server/job/schedule.ts
+++ b/server/job/schedule.ts
@@ -1,5 +1,4 @@
 import { MediaServerType } from '@server/constants/server';
-import blacklistedTagsProcessor from '@server/job/blacklistedTagsProcessor';
 import availabilitySync from '@server/lib/availabilitySync';
 import downloadTracker from '@server/lib/downloadtracker';
 import ImageProxy from '@server/lib/imageproxy';
@@ -22,7 +21,7 @@ interface ScheduledJob {
  job: schedule.Job;
  name: string;
  type: 'process' | 'command';
-  interval: 'seconds' | 'minutes' | 'hours' | 'days' | 'fixed';
+  interval: 'seconds' | 'minutes' | 'hours' | 'fixed';
  cronSchedule: string;
  running?: () => boolean;
  cancelFn?: () => void;
@@ -238,21 +237,5 @@ export const startJobs = (): void => {
    }),
  });

-  scheduledJobs.push({
-    id: 'process-blacklisted-tags',
-    name: 'Process Blacklisted Tags',
-    type: 'process',
-    interval: 'days',
-    cronSchedule: jobs['process-blacklisted-tags'].schedule,
-    job: schedule.scheduleJob(jobs['process-blacklisted-tags'].schedule, () => {
-      logger.info('Starting scheduled job: Process Blacklisted Tags', {
-        label: 'Jobs',
-      });
-      blacklistedTagsProcessor.run();
-    }),
-    running: () => blacklistedTagsProcessor.status().running,
-    cancelFn: () => blacklistedTagsProcessor.cancel(),
-  });
-
  logger.info('Scheduled jobs loaded', { label: 'Jobs' });
 };
--- a/server/lib/availabilitySync.ts
+++ b/server/lib/availabilitySync.ts
@@ -404,34 +404,6 @@ class AvailabilitySync {
            });
          }

-          if (
-            !showExists &&
-            (media.status === MediaStatus.AVAILABLE ||
-              media.status === MediaStatus.PARTIALLY_AVAILABLE ||
-              media.seasons.some(
-                (season) => season.status === MediaStatus.AVAILABLE
-              ) ||
-              media.seasons.some(
-                (season) => season.status === MediaStatus.PARTIALLY_AVAILABLE
-              ))
-          ) {
-            await this.mediaUpdater(media, false, mediaServerType);
-          }
-
-          if (
-            !showExists4k &&
-            (media.status4k === MediaStatus.AVAILABLE ||
-              media.status4k === MediaStatus.PARTIALLY_AVAILABLE ||
-              media.seasons.some(
-                (season) => season.status4k === MediaStatus.AVAILABLE
-              ) ||
-              media.seasons.some(
-                (season) => season.status4k === MediaStatus.PARTIALLY_AVAILABLE
-              ))
-          ) {
-            await this.mediaUpdater(media, true, mediaServerType);
-          }
-
          // TODO: Figure out how to run seasonUpdater for each season

          if ([...finalSeasons.values()].includes(false)) {
@@ -451,6 +423,22 @@ class AvailabilitySync {
              mediaServerType
            );
          }
+
+          if (
+            !showExists &&
+            (media.status === MediaStatus.AVAILABLE ||
+              media.status === MediaStatus.PARTIALLY_AVAILABLE)
+          ) {
+            await this.mediaUpdater(media, false, mediaServerType);
+          }
+
+          if (
+            !showExists4k &&
+            (media.status4k === MediaStatus.AVAILABLE ||
+              media.status4k === MediaStatus.PARTIALLY_AVAILABLE)
+          ) {
+            await this.mediaUpdater(media, true, mediaServerType);
+          }
        }
      }
    } catch (ex) {
@@ -478,10 +466,6 @@ class AvailabilitySync {
      { status: MediaStatus.PARTIALLY_AVAILABLE },
      { status4k: MediaStatus.AVAILABLE },
      { status4k: MediaStatus.PARTIALLY_AVAILABLE },
-      { seasons: { status: MediaStatus.AVAILABLE } },
-      { seasons: { status: MediaStatus.PARTIALLY_AVAILABLE } },
-      { seasons: { status4k: MediaStatus.AVAILABLE } },
-      { seasons: { status4k: MediaStatus.PARTIALLY_AVAILABLE } },
    ];

    let mediaPage: Media[];
@@ -747,11 +731,7 @@ class AvailabilitySync {
        }

        if (radarr && radarr.hasFile) {
-          const resolution =
-            radarr?.movieFile?.mediaInfo?.resolution?.split('x');
-          const is4kMovie =
-            resolution?.length === 2 && Number(resolution[0]) >= 2000;
-          existsInRadarr = is4k ? is4kMovie : !is4kMovie;
+          existsInRadarr = true;
        }
      } catch (ex) {
        if (!ex.message.includes('404')) {
--- a/server/lib/imageproxy.ts
+++ b/server/lib/imageproxy.ts
@@ -1,6 +1,6 @@
 import logger from '@server/logger';
-import axios from 'axios';
-import rateLimit, { type rateLimitOptions } from 'axios-rate-limit';
+import type { RateLimitOptions } from '@server/utils/rateLimit';
+import rateLimit from '@server/utils/rateLimit';
 import { createHash } from 'crypto';
 import { promises } from 'fs';
 import mime from 'mime/lite';
@@ -131,29 +131,33 @@ class ImageProxy {
    return 0;
  }

-  private axios;
+  private fetch: typeof fetch;
  private cacheVersion;
  private key;
+  private baseUrl;
+  private headers: HeadersInit | null = null;

  constructor(
    key: string,
    baseUrl: string,
    options: {
      cacheVersion?: number;
-      rateLimitOptions?: rateLimitOptions;
-      headers?: Record<string, string>;
+      rateLimitOptions?: RateLimitOptions;
+      headers?: HeadersInit;
    } = {}
  ) {
    this.cacheVersion = options.cacheVersion ?? 1;
+    this.baseUrl = baseUrl;
    this.key = key;
-    this.axios = axios.create({
-      baseURL: baseUrl,
-      headers: options.headers,
-    });

    if (options.rateLimitOptions) {
-      this.axios = rateLimit(this.axios, options.rateLimitOptions);
+      this.fetch = rateLimit(fetch, {
+        ...options.rateLimitOptions,
+      });
+    } else {
+      this.fetch = fetch;
    }
+    this.headers = options.headers || null;
  }

  public async getImage(
@@ -189,34 +193,14 @@ class ImageProxy {
  public async clearCachedImage(path: string) {
    // find cacheKey
    const cacheKey = this.getCacheKey(path);
-    const directory = join(this.getCacheDirectory(), cacheKey);
-
-    try {
-      await promises.access(directory);
-    } catch (e) {
-      if (e.code === 'ENOENT') {
-        logger.debug(
-          `Cache directory '${cacheKey}' does not exist; nothing to clear.`,
-          {
-            label: 'Image Cache',
-          }
-        );
-        return;
-      } else {
-        logger.error('Error checking cache directory existence', {
-          label: 'Image Cache',
-          message: e.message,
-        });
-        return;
-      }
-    }

    try {
+      const directory = join(this.getCacheDirectory(), cacheKey);
      const files = await promises.readdir(directory);

      await promises.rm(directory, { recursive: true });

-      logger.debug(`Cleared ${files[0]} from cache 'avatar'`, {
+      logger.info(`Cleared ${files[0]} from cache 'avatar'`, {
        label: 'Image Cache',
      });
    } catch (e) {
@@ -265,22 +249,34 @@ class ImageProxy {
  ): Promise<ImageResponse | null> {
    try {
      const directory = join(this.getCacheDirectory(), cacheKey);
-      const response = await this.axios.get(path, {
-        responseType: 'arraybuffer',
+      const href =
+        this.baseUrl +
+        (this.baseUrl.length > 0
+          ? this.baseUrl.endsWith('/')
+            ? ''
+            : '/'
+          : '') +
+        (path.startsWith('/') ? path.slice(1) : path);
+      const response = await this.fetch(href, {
+        headers: this.headers || undefined,
      });
+      if (!response.ok) {
+        return null;
+      }
+      const arrayBuffer = await response.arrayBuffer();
+      const buffer = Buffer.from(arrayBuffer);

-      const buffer = Buffer.from(response.data, 'binary');
-
-      const contentType = response.headers['content-type'] || '';
-      const extension = mime.getExtension(contentType) || '';
+      const extension = mime.getExtension(
+        response.headers.get('content-type') ?? ''
+      );

      let maxAge = Number(
-        (response.headers['cache-control'] ?? '0').split('=')[1]
+        (response.headers.get('cache-control') ?? '0').split('=')[1]
      );

      if (!maxAge) maxAge = 86400;
      const expireAt = Date.now() + maxAge * 1000;
-      const etag = (response.headers.etag ?? '').replace(/"/g, '');
+      const etag = (response.headers.get('etag') ?? '').replace(/"/g, '');

      await this.writeToCacheDir(
        directory,
--- a/server/lib/notifications/agents/discord.ts
+++ b/server/lib/notifications/agents/discord.ts
@@ -4,7 +4,6 @@ import { User } from '@server/entity/User';
 import type { NotificationAgentDiscord } from '@server/lib/settings';
 import { getSettings, NotificationAgentKey } from '@server/lib/settings';
 import logger from '@server/logger';
-import axios from 'axios';
 import {
  hasNotificationType,
  Notification,
@@ -111,8 +110,6 @@ class DiscordAgent
  ): DiscordRichEmbed {
    const { applicationUrl } = getSettings().main;

-    const appUrl =
-      applicationUrl || `http://localhost:${process.env.port || 5055}`;
    let color = EmbedColors.DARK_PURPLE;
    const fields: Field[] = [];

@@ -127,7 +124,7 @@ class DiscordAgent
      switch (type) {
        case Notification.MEDIA_PENDING:
          color = EmbedColors.ORANGE;
-          status = `[Pending Approval](${appUrl}/requests)`;
+          status = 'Pending Approval';
          break;
        case Notification.MEDIA_APPROVED:
        case Notification.MEDIA_AUTO_APPROVED:
@@ -298,23 +295,39 @@ class DiscordAgent
        userMentions.push(`<@&${settings.options.webhookRoleId}>`);
      }

-      await axios.post(settings.options.webhookUrl, {
-        username: settings.options.botUsername
-          ? settings.options.botUsername
-          : getSettings().main.applicationTitle,
-        avatar_url: settings.options.botAvatarUrl,
-        embeds: [this.buildEmbed(type, payload)],
-        content: userMentions.join(' '),
-      } as DiscordWebhookPayload);
+      const response = await fetch(settings.options.webhookUrl, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+          username: settings.options.botUsername
+            ? settings.options.botUsername
+            : getSettings().main.applicationTitle,
+          avatar_url: settings.options.botAvatarUrl,
+          embeds: [this.buildEmbed(type, payload)],
+          content: userMentions.join(' '),
+        } as DiscordWebhookPayload),
+      });
+      if (!response.ok) {
+        throw new Error(response.statusText, { cause: response });
+      }

      return true;
    } catch (e) {
+      let errorData;
+      try {
+        errorData = await e.cause?.text();
+        errorData = JSON.parse(errorData);
+      } catch {
+        /* empty */
+      }
      logger.error('Error sending Discord notification', {
        label: 'Notifications',
        type: Notification[type],
        subject: payload.subject,
        errorMessage: e.message,
-        response: e?.response?.data,
+        response: errorData,
      });

      return false;
--- a/server/lib/notifications/agents/gotify.ts
+++ b/server/lib/notifications/agents/gotify.ts
@@ -2,7 +2,6 @@ import { IssueStatus, IssueTypeName } from '@server/constants/issue';
 import type { NotificationAgentGotify } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
-import axios from 'axios';
 import { hasNotificationType, Notification } from '..';
 import type { NotificationAgent, NotificationPayload } from './agent';
 import { BaseAgent } from './agent';
@@ -31,12 +30,7 @@ class GotifyAgent
  public shouldSend(): boolean {
    const settings = this.getSettings();

-    if (
-      settings.enabled &&
-      settings.options.url &&
-      settings.options.token &&
-      settings.options.priority
-    ) {
+    if (settings.enabled && settings.options.url && settings.options.token) {
      return true;
    }

@@ -48,17 +42,15 @@ class GotifyAgent
    payload: NotificationPayload
  ): GotifyPayload {
    const { applicationUrl, applicationTitle } = getSettings().main;
-    const settings = this.getSettings();
-    const priority = settings.options.priority ?? 1;
+    let priority = 0;

    const title = payload.event
      ? `${payload.event} - ${payload.subject}`
      : payload.subject;
-
-    let message = payload.message ? `${payload.message}  \n\n` : '';
+    let message = payload.message ?? '';

    if (payload.request) {
-      message += `\n**Requested By:** ${payload.request.requestedBy.displayName}  `;
+      message += `\n\nRequested By: ${payload.request.requestedBy.displayName}`;

      let status = '';
      switch (type) {
@@ -81,29 +73,29 @@ class GotifyAgent
      }

      if (status) {
-        message += `\n**Request Status:** ${status}  `;
+        message += `\nRequest Status: ${status}`;
      }
    } else if (payload.comment) {
-      message += `\nComment from ${payload.comment.user.displayName}:\n${payload.comment.message}  `;
+      message += `\nComment from ${payload.comment.user.displayName}:\n${payload.comment.message}`;
    } else if (payload.issue) {
-      message += `\n\n**Reported By:** ${payload.issue.createdBy.displayName}  `;
-      message += `\n**Issue Type:** ${
-        IssueTypeName[payload.issue.issueType]
-      }  `;
-      message += `\n**Issue Status:** ${
+      message += `\n\nReported By: ${payload.issue.createdBy.displayName}`;
+      message += `\nIssue Type: ${IssueTypeName[payload.issue.issueType]}`;
+      message += `\nIssue Status: ${
        payload.issue.status === IssueStatus.OPEN ? 'Open' : 'Resolved'
-      }  `;
+      }`;
+
+      if (type == Notification.ISSUE_CREATED) {
+        priority = 1;
+      }
    }

    for (const extra of payload.extra ?? []) {
-      message += `\n\n**${extra.name}**\n${extra.value}  `;
+      message += `\n\n**${extra.name}**\n${extra.value}`;
    }

    if (applicationUrl && payload.media) {
      const actionUrl = `${applicationUrl}/${payload.media.mediaType}/${payload.media.tmdbId}`;
-      const displayUrl =
-        actionUrl.length > 40 ? `${actionUrl.slice(0, 41)}...` : actionUrl;
-      message += `\n\n**Open in ${applicationTitle}:** [${displayUrl}](${actionUrl})  `;
+      message += `\n\nOpen in ${applicationTitle}(${actionUrl})`;
    }

    return {
@@ -140,16 +132,32 @@ class GotifyAgent
      const endpoint = `${settings.options.url}/message?token=${settings.options.token}`;
      const notificationPayload = this.getNotificationPayload(type, payload);

-      await axios.post(endpoint, notificationPayload);
+      const response = await fetch(endpoint, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(notificationPayload),
+      });
+      if (!response.ok) {
+        throw new Error(response.statusText, { cause: response });
+      }

      return true;
    } catch (e) {
+      let errorData;
+      try {
+        errorData = await e.cause?.text();
+        errorData = JSON.parse(errorData);
+      } catch {
+        /* empty */
+      }
      logger.error('Error sending Gotify notification', {
        label: 'Notifications',
        type: Notification[type],
        subject: payload.subject,
        errorMessage: e.message,
-        response: e?.response?.data,
+        response: errorData,
      });

      return false;
--- a/server/lib/notifications/agents/lunasea.ts
+++ b/server/lib/notifications/agents/lunasea.ts
@@ -3,7 +3,6 @@ import { MediaStatus } from '@server/constants/media';
 import type { NotificationAgentLunaSea } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
-import axios from 'axios';
 import { hasNotificationType, Notification } from '..';
 import type { NotificationAgent, NotificationPayload } from './agent';
 import { BaseAgent } from './agent';
@@ -101,28 +100,39 @@ class LunaSeaAgent
    });

    try {
-      await axios.post(
-        settings.options.webhookUrl,
-        this.buildPayload(type, payload),
-        settings.options.profileName
+      const response = await fetch(settings.options.webhookUrl, {
+        method: 'POST',
+        headers: settings.options.profileName
          ? {
-              headers: {
-                Authorization: `Basic ${Buffer.from(
-                  `${settings.options.profileName}:`
-                ).toString('base64')}`,
-              },
+              'Content-Type': 'application/json',
            }
-          : undefined
-      );
+          : {
+              'Content-Type': 'application/json',
+              Authorization: `Basic ${Buffer.from(
+                `${settings.options.profileName}:`
+              ).toString('base64')}`,
+            },
+        body: JSON.stringify(this.buildPayload(type, payload)),
+      });
+      if (!response.ok) {
+        throw new Error(response.statusText, { cause: response });
+      }

      return true;
    } catch (e) {
+      let errorData;
+      try {
+        errorData = await e.cause?.text();
+        errorData = JSON.parse(errorData);
+      } catch {
+        /* empty */
+      }
      logger.error('Error sending LunaSea notification', {
        label: 'Notifications',
        type: Notification[type],
        subject: payload.subject,
        errorMessage: e.message,
-        response: e?.response?.data,
+        response: errorData,
      });

      return false;
--- a/server/lib/notifications/agents/pushbullet.ts
+++ b/server/lib/notifications/agents/pushbullet.ts
@@ -5,7 +5,6 @@ import { User } from '@server/entity/User';
 import type { NotificationAgentPushbullet } from '@server/lib/settings';
 import { getSettings, NotificationAgentKey } from '@server/lib/settings';
 import logger from '@server/logger';
-import axios from 'axios';
 import {
  hasNotificationType,
  Notification,
@@ -123,22 +122,34 @@ class PushbulletAgent
      });

      try {
-        await axios.post(
-          endpoint,
-          { ...notificationPayload, channel_tag: settings.options.channelTag },
-          {
-            headers: {
-              'Access-Token': settings.options.accessToken,
-            },
-          }
-        );
+        const response = await fetch(endpoint, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+            'Access-Token': settings.options.accessToken,
+          },
+          body: JSON.stringify({
+            ...notificationPayload,
+            channel_tag: settings.options.channelTag,
+          }),
+        });
+        if (!response.ok) {
+          throw new Error(response.statusText, { cause: response });
+        }
      } catch (e) {
+        let errorData;
+        try {
+          errorData = await e.cause?.text();
+          errorData = JSON.parse(errorData);
+        } catch {
+          /* empty */
+        }
        logger.error('Error sending Pushbullet notification', {
          label: 'Notifications',
          type: Notification[type],
          subject: payload.subject,
          errorMessage: e.message,
-          response: e.response?.data,
+          response: errorData,
        });

        return false;
@@ -163,19 +174,32 @@ class PushbulletAgent
        });

        try {
-          await axios.post(endpoint, notificationPayload, {
+          const response = await fetch(endpoint, {
+            method: 'POST',
            headers: {
+              'Content-Type': 'application/json',
              'Access-Token': payload.notifyUser.settings.pushbulletAccessToken,
            },
+            body: JSON.stringify(notificationPayload),
          });
+          if (!response.ok) {
+            throw new Error(response.statusText, { cause: response });
+          }
        } catch (e) {
+          let errorData;
+          try {
+            errorData = await e.cause?.text();
+            errorData = JSON.parse(errorData);
+          } catch {
+            /* empty */
+          }
          logger.error('Error sending Pushbullet notification', {
            label: 'Notifications',
            recipient: payload.notifyUser.displayName,
            type: Notification[type],
            subject: payload.subject,
            errorMessage: e.message,
-            response: e.response?.data,
+            response: errorData,
          });

          return false;
@@ -211,19 +235,32 @@ class PushbulletAgent
              });

              try {
-                await axios.post(endpoint, notificationPayload, {
+                const response = await fetch(endpoint, {
+                  method: 'POST',
                  headers: {
+                    'Content-Type': 'application/json',
                    'Access-Token': user.settings.pushbulletAccessToken,
                  },
+                  body: JSON.stringify(notificationPayload),
                });
+                if (!response.ok) {
+                  throw new Error(response.statusText, { cause: response });
+                }
              } catch (e) {
+                let errorData;
+                try {
+                  errorData = await e.cause?.text();
+                  errorData = JSON.parse(errorData);
+                } catch {
+                  /* empty */
+                }
                logger.error('Error sending Pushbullet notification', {
                  label: 'Notifications',
                  recipient: user.displayName,
                  type: Notification[type],
                  subject: payload.subject,
                  errorMessage: e.message,
-                  response: e.response?.data,
+                  response: errorData,
                });

                return false;
--- a/server/lib/notifications/agents/pushover.ts
+++ b/server/lib/notifications/agents/pushover.ts
@@ -5,7 +5,6 @@ import { User } from '@server/entity/User';
 import type { NotificationAgentPushover } from '@server/lib/settings';
 import { getSettings, NotificationAgentKey } from '@server/lib/settings';
 import logger from '@server/logger';
-import axios from 'axios';
 import {
  hasNotificationType,
  Notification,
@@ -52,12 +51,15 @@ class PushoverAgent
    imageUrl: string
  ): Promise<Partial<PushoverImagePayload>> {
    try {
-      const response = await axios.get(imageUrl, {
-        responseType: 'arraybuffer',
-      });
-      const base64 = Buffer.from(response.data, 'binary').toString('base64');
+      const response = await fetch(imageUrl);
+      if (!response.ok) {
+        throw new Error(response.statusText, { cause: response });
+      }
+      const arrayBuffer = await response.arrayBuffer();
+      const base64 = Buffer.from(arrayBuffer).toString('base64');
      const contentType = (
-        response.headers['Content-Type'] || response.headers['content-type']
+        response.headers.get('Content-Type') ||
+        response.headers.get('content-type')
      )?.toString();

      return {
@@ -65,10 +67,17 @@ class PushoverAgent
        attachment_type: contentType,
      };
    } catch (e) {
+      let errorData;
+      try {
+        errorData = await e.cause?.text();
+        errorData = JSON.parse(errorData);
+      } catch {
+        /* empty */
+      }
      logger.error('Error getting image payload', {
        label: 'Notifications',
        errorMessage: e.message,
-        response: e?.response?.data,
+        response: errorData,
      });
      return {};
    }
@@ -201,19 +210,35 @@ class PushoverAgent
      });

      try {
-        await axios.post(endpoint, {
-          ...notificationPayload,
-          token: settings.options.accessToken,
-          user: settings.options.userToken,
-          sound: settings.options.sound,
-        } as PushoverPayload);
+        const response = await fetch(endpoint, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify({
+            ...notificationPayload,
+            token: settings.options.accessToken,
+            user: settings.options.userToken,
+            sound: settings.options.sound,
+          } as PushoverPayload),
+        });
+        if (!response.ok) {
+          throw new Error(response.statusText, { cause: response });
+        }
      } catch (e) {
+        let errorData;
+        try {
+          errorData = await e.cause?.text();
+          errorData = JSON.parse(errorData);
+        } catch {
+          /* empty */
+        }
        logger.error('Error sending Pushover notification', {
          label: 'Notifications',
          type: Notification[type],
          subject: payload.subject,
          errorMessage: e.message,
-          response: e.response?.data,
+          response: errorData,
        });

        return false;
@@ -241,20 +266,36 @@ class PushoverAgent
        });

        try {
-          await axios.post(endpoint, {
-            ...notificationPayload,
-            token: payload.notifyUser.settings.pushoverApplicationToken,
-            user: payload.notifyUser.settings.pushoverUserKey,
-            sound: payload.notifyUser.settings.pushoverSound,
-          } as PushoverPayload);
+          const response = await fetch(endpoint, {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+              ...notificationPayload,
+              token: payload.notifyUser.settings.pushoverApplicationToken,
+              user: payload.notifyUser.settings.pushoverUserKey,
+              sound: payload.notifyUser.settings.pushoverSound,
+            } as PushoverPayload),
+          });
+          if (!response.ok) {
+            throw new Error(response.statusText, { cause: response });
+          }
        } catch (e) {
+          let errorData;
+          try {
+            errorData = await e.cause?.text();
+            errorData = JSON.parse(errorData);
+          } catch {
+            /* empty */
+          }
          logger.error('Error sending Pushover notification', {
            label: 'Notifications',
            recipient: payload.notifyUser.displayName,
            type: Notification[type],
            subject: payload.subject,
            errorMessage: e.message,
-            response: e.response?.data,
+            response: errorData,
          });

          return false;
@@ -291,19 +332,35 @@ class PushoverAgent
              });

              try {
-                await axios.post(endpoint, {
-                  ...notificationPayload,
-                  token: user.settings.pushoverApplicationToken,
-                  user: user.settings.pushoverUserKey,
-                } as PushoverPayload);
+                const response = await fetch(endpoint, {
+                  method: 'POST',
+                  headers: {
+                    'Content-Type': 'application/json',
+                  },
+                  body: JSON.stringify({
+                    ...notificationPayload,
+                    token: user.settings.pushoverApplicationToken,
+                    user: user.settings.pushoverUserKey,
+                  } as PushoverPayload),
+                });
+                if (!response.ok) {
+                  throw new Error(response.statusText, { cause: response });
+                }
              } catch (e) {
+                let errorData;
+                try {
+                  errorData = await e.cause?.text();
+                  errorData = JSON.parse(errorData);
+                } catch {
+                  /* empty */
+                }
                logger.error('Error sending Pushover notification', {
                  label: 'Notifications',
                  recipient: user.displayName,
                  type: Notification[type],
                  subject: payload.subject,
                  errorMessage: e.message,
-                  response: e.response?.data,
+                  response: errorData,
                });

                return false;
--- a/server/lib/notifications/agents/slack.ts
+++ b/server/lib/notifications/agents/slack.ts
@@ -2,7 +2,6 @@ import { IssueStatus, IssueTypeName } from '@server/constants/issue';
 import type { NotificationAgentSlack } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
-import axios from 'axios';
 import { hasNotificationType, Notification } from '..';
 import type { NotificationAgent, NotificationPayload } from './agent';
 import { BaseAgent } from './agent';
@@ -238,19 +237,32 @@ class SlackAgent
      subject: payload.subject,
    });
    try {
-      await axios.post(
-        settings.options.webhookUrl,
-        this.buildEmbed(type, payload)
-      );
+      const response = await fetch(settings.options.webhookUrl, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(this.buildEmbed(type, payload)),
+      });
+      if (!response.ok) {
+        throw new Error(response.statusText, { cause: response });
+      }

      return true;
    } catch (e) {
+      let errorData;
+      try {
+        errorData = await e.cause?.text();
+        errorData = JSON.parse(errorData);
+      } catch {
+        /* empty */
+      }
      logger.error('Error sending Slack notification', {
        label: 'Notifications',
        type: Notification[type],
        subject: payload.subject,
        errorMessage: e.message,
-        response: e?.response?.data,
+        response: errorData,
      });

      return false;
--- a/server/lib/notifications/agents/telegram.ts
+++ b/server/lib/notifications/agents/telegram.ts
@@ -5,7 +5,6 @@ import { User } from '@server/entity/User';
 import type { NotificationAgentTelegram } from '@server/lib/settings';
 import { getSettings, NotificationAgentKey } from '@server/lib/settings';
 import logger from '@server/logger';
-import axios from 'axios';
 import {
  hasNotificationType,
  Notification,
@@ -177,19 +176,35 @@ class TelegramAgent
      });

      try {
-        await axios.post(endpoint, {
-          ...notificationPayload,
-          chat_id: settings.options.chatId,
-          message_thread_id: settings.options.messageThreadId,
-          disable_notification: !!settings.options.sendSilently,
-        } as TelegramMessagePayload | TelegramPhotoPayload);
+        const response = await fetch(endpoint, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify({
+            ...notificationPayload,
+            chat_id: settings.options.chatId,
+            message_thread_id: settings.options.messageThreadId,
+            disable_notification: !!settings.options.sendSilently,
+          } as TelegramMessagePayload | TelegramPhotoPayload),
+        });
+        if (!response.ok) {
+          throw new Error(response.statusText, { cause: response });
+        }
      } catch (e) {
+        let errorData;
+        try {
+          errorData = await e.cause?.text();
+          errorData = JSON.parse(errorData);
+        } catch {
+          /* empty */
+        }
        logger.error('Error sending Telegram notification', {
          label: 'Notifications',
          type: Notification[type],
          subject: payload.subject,
          errorMessage: e.message,
-          response: e?.response?.data,
+          response: errorData,
        });

        return false;
@@ -213,22 +228,38 @@ class TelegramAgent
        });

        try {
-          await axios.post(endpoint, {
-            ...notificationPayload,
-            chat_id: payload.notifyUser.settings.telegramChatId,
-            message_thread_id:
-              payload.notifyUser.settings.telegramMessageThreadId,
-            disable_notification:
-              !!payload.notifyUser.settings.telegramSendSilently,
-          } as TelegramMessagePayload | TelegramPhotoPayload);
+          const response = await fetch(endpoint, {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+              ...notificationPayload,
+              chat_id: payload.notifyUser.settings.telegramChatId,
+              message_thread_id:
+                payload.notifyUser.settings.telegramMessageThreadId,
+              disable_notification:
+                !!payload.notifyUser.settings.telegramSendSilently,
+            } as TelegramMessagePayload | TelegramPhotoPayload),
+          });
+          if (!response.ok) {
+            throw new Error(response.statusText, { cause: response });
+          }
        } catch (e) {
+          let errorData;
+          try {
+            errorData = await e.cause?.text();
+            errorData = JSON.parse(errorData);
+          } catch {
+            /* empty */
+          }
          logger.error('Error sending Telegram notification', {
            label: 'Notifications',
            recipient: payload.notifyUser.displayName,
            type: Notification[type],
            subject: payload.subject,
            errorMessage: e.message,
-            response: e?.response?.data,
+            response: errorData,
          });

          return false;
@@ -262,20 +293,36 @@ class TelegramAgent
              });

              try {
-                await axios.post(endpoint, {
-                  ...notificationPayload,
-                  chat_id: user.settings.telegramChatId,
-                  message_thread_id: user.settings.telegramMessageThreadId,
-                  disable_notification: !!user.settings?.telegramSendSilently,
-                } as TelegramMessagePayload | TelegramPhotoPayload);
+                const response = await fetch(endpoint, {
+                  method: 'POST',
+                  headers: {
+                    'Content-Type': 'application/json',
+                  },
+                  body: JSON.stringify({
+                    ...notificationPayload,
+                    chat_id: user.settings.telegramChatId,
+                    message_thread_id: user.settings.telegramMessageThreadId,
+                    disable_notification: !!user.settings?.telegramSendSilently,
+                  } as TelegramMessagePayload | TelegramPhotoPayload),
+                });
+                if (!response.ok) {
+                  throw new Error(response.statusText, { cause: response });
+                }
              } catch (e) {
+                let errorData;
+                try {
+                  errorData = await e.cause?.text();
+                  errorData = JSON.parse(errorData);
+                } catch {
+                  /* empty */
+                }
                logger.error('Error sending Telegram notification', {
                  label: 'Notifications',
                  recipient: user.displayName,
                  type: Notification[type],
                  subject: payload.subject,
                  errorMessage: e.message,
-                  response: e?.response?.data,
+                  response: errorData,
                });

                return false;
--- a/server/lib/notifications/agents/webhook.ts
+++ b/server/lib/notifications/agents/webhook.ts
@@ -3,7 +3,6 @@ import { MediaStatus } from '@server/constants/media';
 import type { NotificationAgentWebhook } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
-import axios from 'axios';
 import { get } from 'lodash';
 import { hasNotificationType, Notification } from '..';
 import type { NotificationAgent, NotificationPayload } from './agent';
@@ -178,26 +177,35 @@ class WebhookAgent
    });

    try {
-      await axios.post(
-        settings.options.webhookUrl,
-        this.buildPayload(type, payload),
-        settings.options.authHeader
-          ? {
-              headers: {
-                Authorization: settings.options.authHeader,
-              },
-            }
-          : undefined
-      );
+      const response = await fetch(settings.options.webhookUrl, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          ...(settings.options.authHeader
+            ? { Authorization: settings.options.authHeader }
+            : {}),
+        },
+        body: JSON.stringify(this.buildPayload(type, payload)),
+      });
+      if (!response.ok) {
+        throw new Error(response.statusText, { cause: response });
+      }

      return true;
    } catch (e) {
+      let errorData;
+      try {
+        errorData = await e.cause?.text();
+        errorData = JSON.parse(errorData);
+      } catch {
+        /* empty */
+      }
      logger.error('Error sending webhook notification', {
        label: 'Notifications',
        type: Notification[type],
        subject: payload.subject,
        errorMessage: e.message,
-        response: e?.response?.data,
+        response: errorData,
      });

      return false;
--- a/server/lib/scanners/jellyfin/index.ts
+++ b/server/lib/scanners/jellyfin/index.ts
@@ -65,8 +65,8 @@ class JellyfinScanner {

      if (!metadata?.Id) {
        logger.debug('No Id metadata for this title. Skipping', {
-          label: 'Jellyfin Sync',
-          jellyfinItemId: jellyfinitem.Id,
+          label: 'Plex Sync',
+          ratingKey: jellyfinitem.Id,
        });
        return;
      }
@@ -204,8 +204,8 @@ class JellyfinScanner {

      if (!metadata?.Id) {
        logger.debug('No Id metadata for this title. Skipping', {
-          label: 'Jellyfin Sync',
-          jellyfinItemId: jellyfinitem.Id,
+          label: 'Plex Sync',
+          ratingKey: jellyfinitem.Id,
        });
        return;
      }
--- a/server/lib/settings/index.ts
+++ b/server/lib/settings/index.ts
@@ -128,8 +128,6 @@ export interface MainSettings {
  discoverRegion: string;
  streamingRegion: string;
  originalLanguage: string;
-  blacklistedTags: string;
-  blacklistedTagsLimit: number;
  mediaServerType: number;
  partialRequestsEnabled: boolean;
  enableSpecialEpisodes: boolean;
@@ -138,6 +136,7 @@ export interface MainSettings {

 export interface NetworkSettings {
  csrfProtection: boolean;
+  forceIpv4First: boolean;
  trustProxy: boolean;
  proxy: ProxySettings;
 }
@@ -255,7 +254,6 @@ export interface NotificationAgentGotify extends NotificationAgentConfig {
  options: {
    url: string;
    token: string;
-    priority: number;
  };
 }

@@ -304,8 +302,7 @@ export type JobId =
  | 'jellyfin-recently-added-scan'
  | 'jellyfin-full-scan'
  | 'image-cache-cleanup'
-  | 'availability-sync'
-  | 'process-blacklisted-tags';
+  | 'availability-sync';

 export interface AllSettings {
  clientId: string;
@@ -352,8 +349,6 @@ class Settings {
        discoverRegion: '',
        streamingRegion: '',
        originalLanguage: '',
-        blacklistedTags: '',
-        blacklistedTagsLimit: 50,
        mediaServerType: MediaServerType.NOT_CONFIGURED,
        partialRequestsEnabled: true,
        enableSpecialEpisodes: false,
@@ -468,7 +463,6 @@ class Settings {
            options: {
              url: '',
              token: '',
-              priority: 0,
            },
          },
        },
@@ -510,13 +504,11 @@ class Settings {
        'image-cache-cleanup': {
          schedule: '0 0 5 * * *',
        },
-        'process-blacklisted-tags': {
-          schedule: '0 30 1 */7 * *',
-        },
      },
      network: {
        csrfProtection: false,
        trustProxy: false,
+        forceIpv4First: false,
        proxy: {
          enabled: false,
          hostname: '',
--- a/server/migration/postgres/1737320080282-AddBlacklistTagsColumn.ts
+++ b/server/migration/postgres/1737320080282-AddBlacklistTagsColumn.ts
@@ -1,17 +0,0 @@
-import type { MigrationInterface, QueryRunner } from 'typeorm';
-
-export class AddBlacklistTagsColumn1737320080282 implements MigrationInterface {
-  name = 'AddBlacklistTagsColumn1737320080282';
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `ALTER TABLE "blacklist" ADD blacklistedTags character varying`
-    );
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `ALTER TABLE "blacklist" DROP COLUMN blacklistedTags`
-    );
-  }
-}
--- a/server/migration/postgres/1743023615532-UpdateWebPush.ts
+++ b/server/migration/postgres/1743023615532-UpdateWebPush.ts
@@ -1,29 +0,0 @@
-import type { MigrationInterface, QueryRunner } from 'typeorm';
-
-export class UpdateWebPush1743023615532 implements MigrationInterface {
-  name = 'UpdateWebPush1743023615532';
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `ALTER TABLE "user_push_subscription" ADD "userAgent" character varying`
-    );
-    await queryRunner.query(
-      `ALTER TABLE "user_push_subscription" ADD "createdAt" TIMESTAMP DEFAULT now()`
-    );
-    await queryRunner.query(
-      `ALTER TABLE "user_push_subscription" DROP CONSTRAINT "UQ_f90ab5a4ed54905a4bb51a7148b"`
-    );
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `ALTER TABLE "user_push_subscription" ADD CONSTRAINT "UQ_f90ab5a4ed54905a4bb51a7148b" UNIQUE ("auth")`
-    );
-    await queryRunner.query(
-      `ALTER TABLE "user_push_subscription" DROP COLUMN "createdAt"`
-    );
-    await queryRunner.query(
-      `ALTER TABLE "user_push_subscription" DROP COLUMN "userAgent"`
-    );
-  }
-}
--- a/server/migration/postgres/1743107707465-AddUserAvatarCacheFields.ts
+++ b/server/migration/postgres/1743107707465-AddUserAvatarCacheFields.ts
@@ -1,21 +0,0 @@
-import type { MigrationInterface, QueryRunner } from 'typeorm';
-
-export class AddUserAvatarCacheFields1743107707465
-  implements MigrationInterface
-{
-  name = 'AddUserAvatarCacheFields1743107707465';
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `ALTER TABLE "user" ADD "avatarETag" character varying`
-    );
-    await queryRunner.query(
-      `ALTER TABLE "user" ADD "avatarVersion" character varying`
-    );
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "avatarVersion"`);
-    await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "avatarETag"`);
-  }
-}
--- a/server/migration/sqlite/1737320080282-AddBlacklistTagsColumn.ts
+++ b/server/migration/sqlite/1737320080282-AddBlacklistTagsColumn.ts
@@ -1,34 +0,0 @@
-import type { MigrationInterface, QueryRunner } from 'typeorm';
-
-export class AddBlacklistTagsColumn1737320080282 implements MigrationInterface {
-  name = 'AddBlacklistTagsColumn1737320080282';
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `CREATE TABLE "temporary_blacklist" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "mediaType" varchar NOT NULL, "title" varchar, "tmdbId" integer NOT NULL, "blacklistedTags" varchar, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "userId" integer, "mediaId" integer, CONSTRAINT "UQ_6bbafa28411e6046421991ea21c" UNIQUE ("tmdbId"), CONSTRAINT "REL_62b7ade94540f9f8d8bede54b9" UNIQUE ("mediaId"), CONSTRAINT "FK_53c1ab62c3e5875bc3ac474823e" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT "FK_62b7ade94540f9f8d8bede54b99" FOREIGN KEY ("mediaId") REFERENCES "media" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
-    );
-    await queryRunner.query(
-      `INSERT INTO "temporary_blacklist"("id", "mediaType", "title", "tmdbId", "blacklistedTags", "createdAt", "userId", "mediaId") SELECT "id", "mediaType", "title", "tmdbId", "blacklistedTags", "createdAt", "userId", "mediaId" FROM "blacklist"`
-    );
-    await queryRunner.query(`DROP TABLE "blacklist"`);
-    await queryRunner.query(
-      `ALTER TABLE "temporary_blacklist" RENAME TO "blacklist"`
-    );
-    await queryRunner.query(
-      `CREATE INDEX "IDX_6bbafa28411e6046421991ea21" ON "blacklist" ("tmdbId") `
-    );
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `ALTER TABLE "blacklist" RENAME TO "temporary_blacklist"`
-    );
-    await queryRunner.query(
-      `CREATE TABLE "blacklist" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "mediaType" varchar NOT NULL, "title" varchar, "tmdbId" integer NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "userId" integer, "mediaId" integer, CONSTRAINT "UQ_6bbafa28411e6046421991ea21c" UNIQUE ("tmdbId"), CONSTRAINT "REL_62b7ade94540f9f8d8bede54b9" UNIQUE ("mediaId"))`
-    );
-    await queryRunner.query(
-      `INSERT INTO "blacklist"("id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId") SELECT "id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId" FROM "temporary_blacklist"`
-    );
-    await queryRunner.query(`DROP TABLE "temporary_blacklist"`);
-  }
-}
--- a/server/migration/sqlite/1743023610704-UpdateWebPush.ts
+++ b/server/migration/sqlite/1743023610704-UpdateWebPush.ts
@@ -1,203 +0,0 @@
-import type { MigrationInterface, QueryRunner } from 'typeorm';
-
-export class UpdateWebPush1743023610704 implements MigrationInterface {
-  name = 'UpdateWebPush1743023610704';
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `CREATE TABLE "temporary_user_push_subscription" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "endpoint" varchar NOT NULL, "p256dh" varchar NOT NULL, "auth" varchar NOT NULL, "userId" integer, "userAgent" varchar, "createdAt" datetime DEFAULT (datetime('now')), CONSTRAINT "UQ_f90ab5a4ed54905a4bb51a7148b" UNIQUE ("auth"), CONSTRAINT "FK_03f7958328e311761b0de675fbe" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
-    );
-    await queryRunner.query(
-      `INSERT INTO "temporary_user_push_subscription"("id", "endpoint", "p256dh", "auth", "userId") SELECT "id", "endpoint", "p256dh", "auth", "userId" FROM "user_push_subscription"`
-    );
-    await queryRunner.query(`DROP TABLE "user_push_subscription"`);
-    await queryRunner.query(
-      `ALTER TABLE "temporary_user_push_subscription" RENAME TO "user_push_subscription"`
-    );
-    await queryRunner.query(
-      `CREATE TABLE "temporary_user_push_subscription" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "endpoint" varchar NOT NULL, "p256dh" varchar NOT NULL, "auth" varchar NOT NULL, "userId" integer, "userAgent" varchar, "createdAt" datetime DEFAULT (datetime('now')), CONSTRAINT "UQ_f90ab5a4ed54905a4bb51a7148b" UNIQUE ("auth"), CONSTRAINT "FK_03f7958328e311761b0de675fbe" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
-    );
-    await queryRunner.query(
-      `INSERT INTO "temporary_user_push_subscription"("id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt") SELECT "id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt" FROM "user_push_subscription"`
-    );
-    await queryRunner.query(`DROP TABLE "user_push_subscription"`);
-    await queryRunner.query(
-      `ALTER TABLE "temporary_user_push_subscription" RENAME TO "user_push_subscription"`
-    );
-    await queryRunner.query(`DROP INDEX "IDX_6bbafa28411e6046421991ea21"`);
-    await queryRunner.query(
-      `CREATE TABLE "temporary_blacklist" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "mediaType" varchar NOT NULL, "title" varchar, "tmdbId" integer NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "userId" integer, "mediaId" integer)`
-    );
-    await queryRunner.query(
-      `INSERT INTO "temporary_blacklist"("id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId") SELECT "id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId" FROM "blacklist"`
-    );
-    await queryRunner.query(`DROP TABLE "blacklist"`);
-    await queryRunner.query(
-      `ALTER TABLE "temporary_blacklist" RENAME TO "blacklist"`
-    );
-    await queryRunner.query(
-      `CREATE INDEX "IDX_6bbafa28411e6046421991ea21" ON "blacklist" ("tmdbId") `
-    );
-    await queryRunner.query(`DROP INDEX "IDX_6bbafa28411e6046421991ea21"`);
-    await queryRunner.query(
-      `CREATE TABLE "temporary_blacklist" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "mediaType" varchar NOT NULL, "title" varchar, "tmdbId" integer NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "userId" integer, "mediaId" integer, CONSTRAINT "UQ_5f933c8ed6ad2c31739e6b94886" UNIQUE ("tmdbId"), CONSTRAINT "UQ_e49b27917899e01d7aca6b0b15c" UNIQUE ("mediaId"))`
-    );
-    await queryRunner.query(
-      `INSERT INTO "temporary_blacklist"("id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId") SELECT "id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId" FROM "blacklist"`
-    );
-    await queryRunner.query(`DROP TABLE "blacklist"`);
-    await queryRunner.query(
-      `ALTER TABLE "temporary_blacklist" RENAME TO "blacklist"`
-    );
-    await queryRunner.query(
-      `CREATE INDEX "IDX_6bbafa28411e6046421991ea21" ON "blacklist" ("tmdbId") `
-    );
-    await queryRunner.query(`DROP INDEX "IDX_7ff2d11f6a83cb52386eaebe74"`);
-    await queryRunner.query(`DROP INDEX "IDX_41a289eb1fa489c1bc6f38d9c3"`);
-    await queryRunner.query(`DROP INDEX "IDX_7157aad07c73f6a6ae3bbd5ef5"`);
-    await queryRunner.query(
-      `CREATE TABLE "temporary_media" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "mediaType" varchar NOT NULL, "tmdbId" integer NOT NULL, "tvdbId" integer, "imdbId" varchar, "status" integer NOT NULL DEFAULT (1), "status4k" integer NOT NULL DEFAULT (1), "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "lastSeasonChange" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP), "mediaAddedAt" datetime DEFAULT (CURRENT_TIMESTAMP), "serviceId" integer, "serviceId4k" integer, "externalServiceId" integer, "externalServiceId4k" integer, "externalServiceSlug" varchar, "externalServiceSlug4k" varchar, "ratingKey" varchar, "ratingKey4k" varchar, "jellyfinMediaId" varchar, "jellyfinMediaId4k" varchar, CONSTRAINT "UQ_41a289eb1fa489c1bc6f38d9c3c" UNIQUE ("tvdbId"))`
-    );
-    await queryRunner.query(
-      `INSERT INTO "temporary_media"("id", "mediaType", "tmdbId", "tvdbId", "imdbId", "status", "status4k", "createdAt", "updatedAt", "lastSeasonChange", "mediaAddedAt", "serviceId", "serviceId4k", "externalServiceId", "externalServiceId4k", "externalServiceSlug", "externalServiceSlug4k", "ratingKey", "ratingKey4k", "jellyfinMediaId", "jellyfinMediaId4k") SELECT "id", "mediaType", "tmdbId", "tvdbId", "imdbId", "status", "status4k", "createdAt", "updatedAt", "lastSeasonChange", "mediaAddedAt", "serviceId", "serviceId4k", "externalServiceId", "externalServiceId4k", "externalServiceSlug", "externalServiceSlug4k", "ratingKey", "ratingKey4k", "jellyfinMediaId", "jellyfinMediaId4k" FROM "media"`
-    );
-    await queryRunner.query(`DROP TABLE "media"`);
-    await queryRunner.query(`ALTER TABLE "temporary_media" RENAME TO "media"`);
-    await queryRunner.query(
-      `CREATE INDEX "IDX_7ff2d11f6a83cb52386eaebe74" ON "media" ("imdbId") `
-    );
-    await queryRunner.query(
-      `CREATE INDEX "IDX_41a289eb1fa489c1bc6f38d9c3" ON "media" ("tvdbId") `
-    );
-    await queryRunner.query(
-      `CREATE INDEX "IDX_7157aad07c73f6a6ae3bbd5ef5" ON "media" ("tmdbId") `
-    );
-    await queryRunner.query(`DROP INDEX "IDX_939f205946256cc0d2a1ac51a8"`);
-    await queryRunner.query(
-      `CREATE TABLE "temporary_watchlist" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "ratingKey" varchar NOT NULL, "mediaType" varchar NOT NULL, "title" varchar NOT NULL, "tmdbId" integer NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "requestedById" integer, "mediaId" integer, CONSTRAINT "UNIQUE_USER_DB" UNIQUE ("tmdbId", "requestedById"), CONSTRAINT "FK_ae34e6b153a90672eb9dc4857d7" FOREIGN KEY ("requestedById") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION, CONSTRAINT "FK_6641da8d831b93dfcb429f8b8bc" FOREIGN KEY ("mediaId") REFERENCES "media" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
-    );
-    await queryRunner.query(
-      `INSERT INTO "temporary_watchlist"("id", "ratingKey", "mediaType", "title", "tmdbId", "createdAt", "updatedAt", "requestedById", "mediaId") SELECT "id", "ratingKey", "mediaType", "title", "tmdbId", "createdAt", "updatedAt", "requestedById", "mediaId" FROM "watchlist"`
-    );
-    await queryRunner.query(`DROP TABLE "watchlist"`);
-    await queryRunner.query(
-      `ALTER TABLE "temporary_watchlist" RENAME TO "watchlist"`
-    );
-    await queryRunner.query(
-      `CREATE INDEX "IDX_939f205946256cc0d2a1ac51a8" ON "watchlist" ("tmdbId") `
-    );
-    await queryRunner.query(`DROP INDEX "IDX_6bbafa28411e6046421991ea21"`);
-    await queryRunner.query(
-      `CREATE TABLE "temporary_blacklist" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "mediaType" varchar NOT NULL, "title" varchar, "tmdbId" integer NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "userId" integer, "mediaId" integer, CONSTRAINT "UQ_5f933c8ed6ad2c31739e6b94886" UNIQUE ("tmdbId"), CONSTRAINT "UQ_e49b27917899e01d7aca6b0b15c" UNIQUE ("mediaId"), CONSTRAINT "FK_53c1ab62c3e5875bc3ac474823e" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT "FK_62b7ade94540f9f8d8bede54b99" FOREIGN KEY ("mediaId") REFERENCES "media" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
-    );
-    await queryRunner.query(
-      `INSERT INTO "temporary_blacklist"("id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId") SELECT "id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId" FROM "blacklist"`
-    );
-    await queryRunner.query(`DROP TABLE "blacklist"`);
-    await queryRunner.query(
-      `ALTER TABLE "temporary_blacklist" RENAME TO "blacklist"`
-    );
-    await queryRunner.query(
-      `CREATE INDEX "IDX_6bbafa28411e6046421991ea21" ON "blacklist" ("tmdbId") `
-    );
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`DROP INDEX "IDX_6bbafa28411e6046421991ea21"`);
-    await queryRunner.query(
-      `ALTER TABLE "blacklist" RENAME TO "temporary_blacklist"`
-    );
-    await queryRunner.query(
-      `CREATE TABLE "blacklist" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "mediaType" varchar NOT NULL, "title" varchar, "tmdbId" integer NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "userId" integer, "mediaId" integer, CONSTRAINT "UQ_5f933c8ed6ad2c31739e6b94886" UNIQUE ("tmdbId"), CONSTRAINT "UQ_e49b27917899e01d7aca6b0b15c" UNIQUE ("mediaId"))`
-    );
-    await queryRunner.query(
-      `INSERT INTO "blacklist"("id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId") SELECT "id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId" FROM "temporary_blacklist"`
-    );
-    await queryRunner.query(`DROP TABLE "temporary_blacklist"`);
-    await queryRunner.query(
-      `CREATE INDEX "IDX_6bbafa28411e6046421991ea21" ON "blacklist" ("tmdbId") `
-    );
-    await queryRunner.query(`DROP INDEX "IDX_939f205946256cc0d2a1ac51a8"`);
-    await queryRunner.query(
-      `ALTER TABLE "watchlist" RENAME TO "temporary_watchlist"`
-    );
-    await queryRunner.query(
-      `CREATE TABLE "watchlist" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "ratingKey" varchar NOT NULL, "mediaType" varchar NOT NULL, "title" varchar NOT NULL, "tmdbId" integer NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "requestedById" integer, "mediaId" integer, CONSTRAINT "UNIQUE_USER_DB" UNIQUE ("tmdbId", "requestedById"))`
-    );
-    await queryRunner.query(
-      `INSERT INTO "watchlist"("id", "ratingKey", "mediaType", "title", "tmdbId", "createdAt", "updatedAt", "requestedById", "mediaId") SELECT "id", "ratingKey", "mediaType", "title", "tmdbId", "createdAt", "updatedAt", "requestedById", "mediaId" FROM "temporary_watchlist"`
-    );
-    await queryRunner.query(`DROP TABLE "temporary_watchlist"`);
-    await queryRunner.query(
-      `CREATE INDEX "IDX_939f205946256cc0d2a1ac51a8" ON "watchlist" ("tmdbId") `
-    );
-    await queryRunner.query(`DROP INDEX "IDX_7157aad07c73f6a6ae3bbd5ef5"`);
-    await queryRunner.query(`DROP INDEX "IDX_41a289eb1fa489c1bc6f38d9c3"`);
-    await queryRunner.query(`DROP INDEX "IDX_7ff2d11f6a83cb52386eaebe74"`);
-    await queryRunner.query(`ALTER TABLE "media" RENAME TO "temporary_media"`);
-    await queryRunner.query(
-      `CREATE TABLE "media" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "mediaType" varchar NOT NULL, "tmdbId" integer NOT NULL, "tvdbId" integer, "imdbId" varchar, "status" integer NOT NULL DEFAULT (1), "status4k" integer NOT NULL DEFAULT (1), "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "lastSeasonChange" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP), "mediaAddedAt" datetime, "serviceId" integer, "serviceId4k" integer, "externalServiceId" integer, "externalServiceId4k" integer, "externalServiceSlug" varchar, "externalServiceSlug4k" varchar, "ratingKey" varchar, "ratingKey4k" varchar, "jellyfinMediaId" varchar, "jellyfinMediaId4k" varchar, CONSTRAINT "UQ_41a289eb1fa489c1bc6f38d9c3c" UNIQUE ("tvdbId"))`
-    );
-    await queryRunner.query(
-      `INSERT INTO "media"("id", "mediaType", "tmdbId", "tvdbId", "imdbId", "status", "status4k", "createdAt", "updatedAt", "lastSeasonChange", "mediaAddedAt", "serviceId", "serviceId4k", "externalServiceId", "externalServiceId4k", "externalServiceSlug", "externalServiceSlug4k", "ratingKey", "ratingKey4k", "jellyfinMediaId", "jellyfinMediaId4k") SELECT "id", "mediaType", "tmdbId", "tvdbId", "imdbId", "status", "status4k", "createdAt", "updatedAt", "lastSeasonChange", "mediaAddedAt", "serviceId", "serviceId4k", "externalServiceId", "externalServiceId4k", "externalServiceSlug", "externalServiceSlug4k", "ratingKey", "ratingKey4k", "jellyfinMediaId", "jellyfinMediaId4k" FROM "temporary_media"`
-    );
-    await queryRunner.query(`DROP TABLE "temporary_media"`);
-    await queryRunner.query(
-      `CREATE INDEX "IDX_7157aad07c73f6a6ae3bbd5ef5" ON "media" ("tmdbId") `
-    );
-    await queryRunner.query(
-      `CREATE INDEX "IDX_41a289eb1fa489c1bc6f38d9c3" ON "media" ("tvdbId") `
-    );
-    await queryRunner.query(
-      `CREATE INDEX "IDX_7ff2d11f6a83cb52386eaebe74" ON "media" ("imdbId") `
-    );
-    await queryRunner.query(`DROP INDEX "IDX_6bbafa28411e6046421991ea21"`);
-    await queryRunner.query(
-      `ALTER TABLE "blacklist" RENAME TO "temporary_blacklist"`
-    );
-    await queryRunner.query(
-      `CREATE TABLE "blacklist" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "mediaType" varchar NOT NULL, "title" varchar, "tmdbId" integer NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "userId" integer, "mediaId" integer)`
-    );
-    await queryRunner.query(
-      `INSERT INTO "blacklist"("id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId") SELECT "id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId" FROM "temporary_blacklist"`
-    );
-    await queryRunner.query(`DROP TABLE "temporary_blacklist"`);
-    await queryRunner.query(
-      `CREATE INDEX "IDX_6bbafa28411e6046421991ea21" ON "blacklist" ("tmdbId") `
-    );
-    await queryRunner.query(`DROP INDEX "IDX_6bbafa28411e6046421991ea21"`);
-    await queryRunner.query(
-      `ALTER TABLE "blacklist" RENAME TO "temporary_blacklist"`
-    );
-    await queryRunner.query(
-      `CREATE TABLE "blacklist" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "mediaType" varchar NOT NULL, "title" varchar, "tmdbId" integer NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "userId" integer, "mediaId" integer, CONSTRAINT "UQ_6bbafa28411e6046421991ea21c" UNIQUE ("tmdbId", "userId"))`
-    );
-    await queryRunner.query(
-      `INSERT INTO "blacklist"("id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId") SELECT "id", "mediaType", "title", "tmdbId", "createdAt", "userId", "mediaId" FROM "temporary_blacklist"`
-    );
-    await queryRunner.query(`DROP TABLE "temporary_blacklist"`);
-    await queryRunner.query(
-      `CREATE INDEX "IDX_6bbafa28411e6046421991ea21" ON "blacklist" ("tmdbId") `
-    );
-    await queryRunner.query(
-      `ALTER TABLE "user_push_subscription" RENAME TO "temporary_user_push_subscription"`
-    );
-    await queryRunner.query(
-      `CREATE TABLE "user_push_subscription" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "endpoint" varchar NOT NULL, "p256dh" varchar NOT NULL, "auth" varchar NOT NULL, "userId" integer, "userAgent" varchar, "createdAt" datetime DEFAULT (datetime('now')), CONSTRAINT "UQ_f90ab5a4ed54905a4bb51a7148b" UNIQUE ("auth"), CONSTRAINT "FK_03f7958328e311761b0de675fbe" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
-    );
-    await queryRunner.query(
-      `INSERT INTO "user_push_subscription"("id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt") SELECT "id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt" FROM "temporary_user_push_subscription"`
-    );
-    await queryRunner.query(`DROP TABLE "temporary_user_push_subscription"`);
-    await queryRunner.query(
-      `ALTER TABLE "user_push_subscription" RENAME TO "temporary_user_push_subscription"`
-    );
-    await queryRunner.query(
-      `CREATE TABLE "user_push_subscription" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "endpoint" varchar NOT NULL, "p256dh" varchar NOT NULL, "auth" varchar NOT NULL, "userId" integer, CONSTRAINT "UQ_f90ab5a4ed54905a4bb51a7148b" UNIQUE ("auth"), CONSTRAINT "FK_03f7958328e311761b0de675fbe" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
-    );
-    await queryRunner.query(
-      `INSERT INTO "user_push_subscription"("id", "endpoint", "p256dh", "auth", "userId") SELECT "id", "endpoint", "p256dh", "auth", "userId" FROM "temporary_user_push_subscription"`
-    );
-    await queryRunner.query(`DROP TABLE "temporary_user_push_subscription"`);
-  }
-}
--- a/server/migration/sqlite/1743107645301-AddUserAvatarCacheFields.ts
+++ b/server/migration/sqlite/1743107645301-AddUserAvatarCacheFields.ts
@@ -1,69 +0,0 @@
-import type { MigrationInterface, QueryRunner } from 'typeorm';
-
-export class AddUserAvatarCacheFields1743107645301
-  implements MigrationInterface
-{
-  name = 'AddUserAvatarCacheFields1743107645301';
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `CREATE TABLE "temporary_user_push_subscription" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "endpoint" varchar NOT NULL, "p256dh" varchar NOT NULL, "auth" varchar NOT NULL, "userId" integer, "userAgent" varchar, "createdAt" datetime DEFAULT (datetime('now')), CONSTRAINT "UQ_f90ab5a4ed54905a4bb51a7148b" UNIQUE ("auth"), CONSTRAINT "FK_03f7958328e311761b0de675fbe" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
-    );
-    await queryRunner.query(
-      `INSERT INTO "temporary_user_push_subscription"("id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt") SELECT "id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt" FROM "user_push_subscription"`
-    );
-    await queryRunner.query(`DROP TABLE "user_push_subscription"`);
-    await queryRunner.query(
-      `ALTER TABLE "temporary_user_push_subscription" RENAME TO "user_push_subscription"`
-    );
-    await queryRunner.query(
-      `CREATE TABLE "temporary_user" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar NOT NULL, "username" varchar, "plexId" integer, "plexToken" varchar, "permissions" integer NOT NULL DEFAULT (0), "avatar" varchar NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "password" varchar, "userType" integer NOT NULL DEFAULT (1), "plexUsername" varchar, "resetPasswordGuid" varchar, "recoveryLinkExpirationDate" date, "movieQuotaLimit" integer, "movieQuotaDays" integer, "tvQuotaLimit" integer, "tvQuotaDays" integer, "jellyfinUsername" varchar, "jellyfinAuthToken" varchar, "jellyfinUserId" varchar, "jellyfinDeviceId" varchar, "avatarETag" varchar, "avatarVersion" varchar, CONSTRAINT "UQ_e12875dfb3b1d92d7d7c5377e22" UNIQUE ("email"))`
-    );
-    await queryRunner.query(
-      `INSERT INTO "temporary_user"("id", "email", "username", "plexId", "plexToken", "permissions", "avatar", "createdAt", "updatedAt", "password", "userType", "plexUsername", "resetPasswordGuid", "recoveryLinkExpirationDate", "movieQuotaLimit", "movieQuotaDays", "tvQuotaLimit", "tvQuotaDays", "jellyfinUsername", "jellyfinAuthToken", "jellyfinUserId", "jellyfinDeviceId") SELECT "id", "email", "username", "plexId", "plexToken", "permissions", "avatar", "createdAt", "updatedAt", "password", "userType", "plexUsername", "resetPasswordGuid", "recoveryLinkExpirationDate", "movieQuotaLimit", "movieQuotaDays", "tvQuotaLimit", "tvQuotaDays", "jellyfinUsername", "jellyfinAuthToken", "jellyfinUserId", "jellyfinDeviceId" FROM "user"`
-    );
-    await queryRunner.query(`DROP TABLE "user"`);
-    await queryRunner.query(`ALTER TABLE "temporary_user" RENAME TO "user"`);
-    await queryRunner.query(
-      `CREATE TABLE "temporary_user_push_subscription" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "endpoint" varchar NOT NULL, "p256dh" varchar NOT NULL, "auth" varchar NOT NULL, "userId" integer, "userAgent" varchar, "createdAt" datetime DEFAULT (datetime('now')), CONSTRAINT "UQ_f90ab5a4ed54905a4bb51a7148b" UNIQUE ("auth"), CONSTRAINT "FK_03f7958328e311761b0de675fbe" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
-    );
-    await queryRunner.query(
-      `INSERT INTO "temporary_user_push_subscription"("id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt") SELECT "id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt" FROM "user_push_subscription"`
-    );
-    await queryRunner.query(`DROP TABLE "user_push_subscription"`);
-    await queryRunner.query(
-      `ALTER TABLE "temporary_user_push_subscription" RENAME TO "user_push_subscription"`
-    );
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `ALTER TABLE "user_push_subscription" RENAME TO "temporary_user_push_subscription"`
-    );
-    await queryRunner.query(
-      `CREATE TABLE "user_push_subscription" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "endpoint" varchar NOT NULL, "p256dh" varchar NOT NULL, "auth" varchar NOT NULL, "userId" integer, "userAgent" varchar, "createdAt" datetime DEFAULT (datetime('now')), CONSTRAINT "UQ_f90ab5a4ed54905a4bb51a7148b" UNIQUE ("auth"), CONSTRAINT "FK_03f7958328e311761b0de675fbe" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
-    );
-    await queryRunner.query(
-      `INSERT INTO "user_push_subscription"("id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt") SELECT "id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt" FROM "temporary_user_push_subscription"`
-    );
-    await queryRunner.query(`DROP TABLE "temporary_user_push_subscription"`);
-    await queryRunner.query(`ALTER TABLE "user" RENAME TO "temporary_user"`);
-    await queryRunner.query(
-      `CREATE TABLE "user" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar NOT NULL, "username" varchar, "plexId" integer, "plexToken" varchar, "permissions" integer NOT NULL DEFAULT (0), "avatar" varchar NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "updatedAt" datetime NOT NULL DEFAULT (datetime('now')), "password" varchar, "userType" integer NOT NULL DEFAULT (1), "plexUsername" varchar, "resetPasswordGuid" varchar, "recoveryLinkExpirationDate" date, "movieQuotaLimit" integer, "movieQuotaDays" integer, "tvQuotaLimit" integer, "tvQuotaDays" integer, "jellyfinUsername" varchar, "jellyfinAuthToken" varchar, "jellyfinUserId" varchar, "jellyfinDeviceId" varchar, CONSTRAINT "UQ_e12875dfb3b1d92d7d7c5377e22" UNIQUE ("email"))`
-    );
-    await queryRunner.query(
-      `INSERT INTO "user"("id", "email", "username", "plexId", "plexToken", "permissions", "avatar", "createdAt", "updatedAt", "password", "userType", "plexUsername", "resetPasswordGuid", "recoveryLinkExpirationDate", "movieQuotaLimit", "movieQuotaDays", "tvQuotaLimit", "tvQuotaDays", "jellyfinUsername", "jellyfinAuthToken", "jellyfinUserId", "jellyfinDeviceId") SELECT "id", "email", "username", "plexId", "plexToken", "permissions", "avatar", "createdAt", "updatedAt", "password", "userType", "plexUsername", "resetPasswordGuid", "recoveryLinkExpirationDate", "movieQuotaLimit", "movieQuotaDays", "tvQuotaLimit", "tvQuotaDays", "jellyfinUsername", "jellyfinAuthToken", "jellyfinUserId", "jellyfinDeviceId" FROM "temporary_user"`
-    );
-    await queryRunner.query(`DROP TABLE "temporary_user"`);
-    await queryRunner.query(
-      `ALTER TABLE "user_push_subscription" RENAME TO "temporary_user_push_subscription"`
-    );
-    await queryRunner.query(
-      `CREATE TABLE "user_push_subscription" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "endpoint" varchar NOT NULL, "p256dh" varchar NOT NULL, "auth" varchar NOT NULL, "userId" integer, "userAgent" varchar, "createdAt" datetime DEFAULT (datetime('now')), CONSTRAINT "UQ_f90ab5a4ed54905a4bb51a7148b" UNIQUE ("auth"), CONSTRAINT "FK_03f7958328e311761b0de675fbe" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`
-    );
-    await queryRunner.query(
-      `INSERT INTO "user_push_subscription"("id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt") SELECT "id", "endpoint", "p256dh", "auth", "userId", "userAgent", "createdAt" FROM "temporary_user_push_subscription"`
-    );
-    await queryRunner.query(`DROP TABLE "temporary_user_push_subscription"`);
-  }
-}
--- a/server/routes/auth.ts
+++ b/server/routes/auth.ts
@@ -10,7 +10,6 @@ import { Permission } from '@server/lib/permissions';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { isAuthenticated } from '@server/middleware/auth';
-import { checkAvatarChanged } from '@server/routes/avatarproxy';
 import { ApiError } from '@server/types/error';
 import { getHostname } from '@server/utils/getHostname';
 import * as EmailValidator from 'email-validator';
@@ -217,10 +216,6 @@ authRoutes.post('/plex', async (req, res, next) => {
  }
 });

-function getUserAvatarUrl(user: User): string {
-  return `/avatarproxy/${user.jellyfinUserId}?v=${user.avatarVersion}`;
-}
-
 authRoutes.post('/jellyfin', async (req, res, next) => {
  const settings = getSettings();
  const userRepository = getRepository(User);
@@ -348,12 +343,12 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
          jellyfinDeviceId: deviceId,
          jellyfinAuthToken: account.AccessToken,
          permissions: Permission.ADMIN,
+          avatar: `/avatarproxy/${account.User.Id}`,
          userType:
            body.serverType === MediaServerType.JELLYFIN
              ? UserType.JELLYFIN
              : UserType.EMBY,
        });
-        user.avatar = getUserAvatarUrl(user);

        await userRepository.save(user);
      } else {
@@ -380,7 +375,7 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
        user.jellyfinDeviceId = deviceId;
        user.jellyfinAuthToken = account.AccessToken;
        user.permissions = Permission.ADMIN;
-        user.avatar = getUserAvatarUrl(user);
+        user.avatar = `/avatarproxy/${account.User.Id}`;
        user.userType =
          body.serverType === MediaServerType.JELLYFIN
            ? UserType.JELLYFIN
@@ -427,7 +422,7 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
          jellyfinUsername: account.User.Name,
        }
      );
-      user.avatar = getUserAvatarUrl(user);
+      user.avatar = `/avatarproxy/${account.User.Id}`;
      user.jellyfinUsername = account.User.Name;

      if (user.username === account.User.Name) {
@@ -465,12 +460,12 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
        jellyfinUserId: account.User.Id,
        jellyfinDeviceId: deviceId,
        permissions: settings.main.defaultPermissions,
+        avatar: `/avatarproxy/${account.User.Id}`,
        userType:
          settings.main.mediaServerType === MediaServerType.JELLYFIN
            ? UserType.JELLYFIN
            : UserType.EMBY,
      });
-      user.avatar = getUserAvatarUrl(user);

      //initialize Jellyfin/Emby users with local login
      const passedExplicitPassword = body.password && body.password.length > 0;
@@ -480,26 +475,6 @@ authRoutes.post('/jellyfin', async (req, res, next) => {
      await userRepository.save(user);
    }

-    if (user && user.jellyfinUserId) {
-      try {
-        const { changed } = await checkAvatarChanged(user);
-
-        if (changed) {
-          user.avatar = getUserAvatarUrl(user);
-          await userRepository.save(user);
-          logger.debug('Avatar updated during login', {
-            userId: user.id,
-            jellyfinUserId: user.jellyfinUserId,
-          });
-        }
-      } catch (error) {
-        logger.error('Error handling avatar during login', {
-          label: 'Auth',
-          errorMessage: error.message,
-        });
-      }
-    }
-
    // Set logged in session
    if (req.session) {
      req.session.userId = user?.id;
--- a/server/routes/avatarproxy.ts
+++ b/server/routes/avatarproxy.ts
@@ -6,15 +6,12 @@ import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import { getAppVersion } from '@server/utils/appVersion';
 import { getHostname } from '@server/utils/getHostname';
-import axios from 'axios';
 import { Router } from 'express';
 import gravatarUrl from 'gravatar-url';
-import { createHash } from 'node:crypto';

 const router = Router();

 let _avatarImageProxy: ImageProxy | null = null;
-
 async function initAvatarImageProxy() {
  if (!_avatarImageProxy) {
    const userRepository = getRepository(User);
@@ -34,83 +31,6 @@ async function initAvatarImageProxy() {
  return _avatarImageProxy;
 }

-function getJellyfinAvatarUrl(userId: string) {
-  const settings = getSettings();
-  return settings.main.mediaServerType === MediaServerType.JELLYFIN
-    ? `${getHostname()}/UserImage?UserId=${userId}`
-    : `${getHostname()}/Users/${userId}/Images/Primary?quality=90`;
-}
-
-function computeImageHash(buffer: Buffer): string {
-  return createHash('sha256').update(buffer).digest('hex');
-}
-
-export async function checkAvatarChanged(
-  user: User
-): Promise<{ changed: boolean; etag?: string }> {
-  try {
-    if (!user || !user.jellyfinUserId) {
-      return { changed: false };
-    }
-
-    const jellyfinAvatarUrl = getJellyfinAvatarUrl(user.jellyfinUserId);
-
-    let headResponse;
-    try {
-      headResponse = await axios.head(jellyfinAvatarUrl);
-      if (headResponse.status !== 200) {
-        return { changed: false };
-      }
-    } catch (error) {
-      return { changed: false };
-    }
-
-    const settings = getSettings();
-    let remoteVersion: string;
-    if (settings.main.mediaServerType === MediaServerType.JELLYFIN) {
-      const remoteLastModifiedStr = headResponse.headers['last-modified'] || '';
-      remoteVersion = (
-        Date.parse(remoteLastModifiedStr) || Date.now()
-      ).toString();
-    } else if (settings.main.mediaServerType === MediaServerType.EMBY) {
-      remoteVersion =
-        headResponse.headers['etag']?.replace(/"/g, '') ||
-        Date.now().toString();
-    } else {
-      remoteVersion = Date.now().toString();
-    }
-
-    if (user.avatarVersion && user.avatarVersion === remoteVersion) {
-      return { changed: false, etag: user.avatarETag ?? undefined };
-    }
-
-    const avatarImageCache = await initAvatarImageProxy();
-    await avatarImageCache.clearCachedImage(jellyfinAvatarUrl);
-    const imageData = await avatarImageCache.getImage(
-      jellyfinAvatarUrl,
-      gravatarUrl(user.email || 'none', { default: 'mm', size: 200 })
-    );
-
-    const newHash = computeImageHash(imageData.imageBuffer);
-
-    const hasChanged = user.avatarETag !== newHash;
-
-    user.avatarVersion = remoteVersion;
-    if (hasChanged) {
-      user.avatarETag = newHash;
-    }
-
-    await getRepository(User).save(user);
-
-    return { changed: hasChanged, etag: newHash };
-  } catch (error) {
-    logger.error('Error checking avatar changes', {
-      errorMessage: error.message,
-    });
-    return { changed: false };
-  }
-}
-
 router.get('/:jellyfinUserId', async (req, res) => {
  try {
    if (!req.params.jellyfinUserId.match(/^[a-f0-9]{32}$/)) {
@@ -126,10 +46,6 @@ router.get('/:jellyfinUserId', async (req, res) => {

    const avatarImageCache = await initAvatarImageProxy();

-    const userEtag = req.headers['if-none-match'];
-
-    const versionParam = req.query.v;
-
    const user = await getRepository(User).findOne({
      where: { jellyfinUserId: req.params.jellyfinUserId },
    });
@@ -139,7 +55,13 @@ router.get('/:jellyfinUserId', async (req, res) => {
      size: 200,
    });

-    const jellyfinAvatarUrl = getJellyfinAvatarUrl(req.params.jellyfinUserId);
+    const setttings = getSettings();
+    const jellyfinAvatarUrl =
+      setttings.main.mediaServerType === MediaServerType.JELLYFIN
+        ? `${getHostname()}/UserImage?UserId=${req.params.jellyfinUserId}`
+        : `${getHostname()}/Users/${
+            req.params.jellyfinUserId
+          }/Images/Primary?quality=90`;

    let imageData = await avatarImageCache.getImage(
      jellyfinAvatarUrl,
@@ -151,15 +73,10 @@ router.get('/:jellyfinUserId', async (req, res) => {
      imageData = await avatarImageCache.getImage(fallbackUrl);
    }

-    if (userEtag && userEtag === `"${imageData.meta.etag}"` && !versionParam) {
-      return res.status(304).end();
-    }
-
    res.writeHead(200, {
      'Content-Type': `image/${imageData.meta.extension}`,
      'Content-Length': imageData.imageBuffer.length,
      'Cache-Control': `public, max-age=${imageData.meta.curRevalidate}`,
-      ETag: `"${imageData.meta.etag}"`,
      'OS-Cache-Key': imageData.meta.cacheKey,
      'OS-Cache-Status': imageData.meta.cacheMiss ? 'MISS' : 'HIT',
    });
--- a/server/routes/blacklist.ts
+++ b/server/routes/blacklist.ts
@@ -19,54 +19,39 @@ export const blacklistAdd = z.object({
  user: z.coerce.number(),
 });

-const blacklistGet = z.object({
-  take: z.coerce.number().int().positive().default(25),
-  skip: z.coerce.number().int().nonnegative().default(0),
-  search: z.string().optional(),
-  filter: z.enum(['all', 'manual', 'blacklistedTags']).optional(),
-});
-
 blacklistRoutes.get(
  '/',
  isAuthenticated([Permission.MANAGE_BLACKLIST, Permission.VIEW_BLACKLIST], {
    type: 'or',
  }),
  async (req, res, next) => {
-    const { take, skip, search, filter } = blacklistGet.parse(req.query);
+    const pageSize = req.query.take ? Number(req.query.take) : 25;
+    const skip = req.query.skip ? Number(req.query.skip) : 0;
+    const search = (req.query.search as string) ?? '';

    try {
      let query = getRepository(Blacklist)
        .createQueryBuilder('blacklist')
-        .leftJoinAndSelect('blacklist.user', 'user')
-        .where('1 = 1'); // Allow use of andWhere later
+        .leftJoinAndSelect('blacklist.user', 'user');

-      switch (filter) {
-        case 'manual':
-          query = query.andWhere('blacklist.blacklistedTags IS NULL');
-          break;
-        case 'blacklistedTags':
-          query = query.andWhere('blacklist.blacklistedTags IS NOT NULL');
-          break;
-      }
-
-      if (search) {
-        query = query.andWhere('blacklist.title like :title', {
+      if (search.length > 0) {
+        query = query.where('blacklist.title like :title', {
          title: `%${search}%`,
        });
      }

      const [blacklistedItems, itemsCount] = await query
        .orderBy('blacklist.createdAt', 'DESC')
-        .take(take)
+        .take(pageSize)
        .skip(skip)
        .getManyAndCount();

      return res.status(200).json({
        pageInfo: {
-          pages: Math.ceil(itemsCount / take),
-          pageSize: take,
+          pages: Math.ceil(itemsCount / pageSize),
+          pageSize,
          results: itemsCount,
-          page: Math.ceil(skip / take) + 1,
+          page: Math.ceil(skip / pageSize) + 1,
        },
        results: blacklistedItems,
      } as BlacklistResultsResponse);
--- a/server/routes/imageproxy.ts
+++ b/server/routes/imageproxy.ts
@@ -5,7 +5,6 @@ import { Router } from 'express';
 const router = Router();
 const tmdbImageProxy = new ImageProxy('tmdb', 'https://image.tmdb.org', {
  rateLimitOptions: {
-    maxRequests: 20,
    maxRPS: 50,
  },
 });
--- a/server/routes/media.ts
+++ b/server/routes/media.ts
@@ -237,6 +237,19 @@ mediaRoutes.delete(
      }

      if (isMovie) {
+        // check if the movie exists
+        try {
+          await (service as RadarrAPI).getMovie({
+            id: parseInt(
+              is4k
+                ? (media.externalServiceSlug4k as string)
+                : (media.externalServiceSlug as string)
+            ),
+          });
+        } catch {
+          return res.status(204).send();
+        }
+        // remove the movie
        await (service as RadarrAPI).removeMovie(
          parseInt(
            is4k
@@ -251,6 +264,13 @@ mediaRoutes.delete(
        if (!tvdbId) {
          throw new Error('TVDB ID not found');
        }
+        // check if the series exists
+        try {
+          await (service as SonarrAPI).getSeriesByTvdbId(tvdbId);
+        } catch {
+          return res.status(204).send();
+        }
+        // remove the series
        await (service as SonarrAPI).removeSerie(tvdbId);
      }

--- a/server/routes/request.ts
+++ b/server/routes/request.ts
@@ -189,7 +189,7 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
      );

      // add profile names to the media requests, with undefined if not found
-      let mappedRequests = requests.map((r) => {
+      const requestsWithProfileNames = requests.map((r) => {
        switch (r.type) {
          case MediaType.MOVIE: {
            const profileName = radarrServers
@@ -212,36 +212,6 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
        }
      });

-      // add canRemove prop if user has permission
-      if (req.user?.hasPermission(Permission.MANAGE_REQUESTS)) {
-        mappedRequests = mappedRequests.map((r) => {
-          switch (r.type) {
-            case MediaType.MOVIE: {
-              return {
-                ...r,
-                // check if the radarr server for this request is configured
-                canRemove: radarrServers.some(
-                  (server) =>
-                    server.id ===
-                    (r.is4k ? r.media.serviceId4k : r.media.serviceId)
-                ),
-              };
-            }
-            case MediaType.TV: {
-              return {
-                ...r,
-                // check if the sonarr server for this request is configured
-                canRemove: sonarrServers.some(
-                  (server) =>
-                    server.id ===
-                    (r.is4k ? r.media.serviceId4k : r.media.serviceId)
-                ),
-              };
-            }
-          }
-        });
-      }
-
      return res.status(200).json({
        pageInfo: {
          pages: Math.ceil(requestCount / pageSize),
@@ -249,7 +219,7 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
          results: requestCount,
          page: Math.ceil(skip / pageSize) + 1,
        },
-        results: mappedRequests,
+        results: requestsWithProfileNames,
      });
    } catch (e) {
      next({ status: 500, message: e.message });
@@ -569,31 +539,6 @@ requestRoutes.delete('/:requestId', async (req, res, next) => {

    await requestRepository.remove(request);

-    const mediaRepository = getRepository(Media);
-
-    const media = await mediaRepository.findOne({
-      where: { id: request.media.id },
-      relations: { requests: true },
-    });
-
-    if (media) {
-      if (
-        !media.requests.some((r) => !r.is4k) &&
-        media.status !== MediaStatus.AVAILABLE
-      ) {
-        media.status = MediaStatus.UNKNOWN;
-      }
-
-      if (
-        !media.requests.some((r) => r.is4k) &&
-        media.status4k !== MediaStatus.AVAILABLE
-      ) {
-        media.status4k = MediaStatus.UNKNOWN;
-      }
-
-      await mediaRepository.save(media);
-    }
-
    return res.status(204).send();
  } catch (e) {
    logger.error('Something went wrong deleting a request.', {
--- a/server/routes/user/index.ts
+++ b/server/routes/user/index.ts
@@ -184,15 +184,13 @@ router.post<
    endpoint: string;
    p256dh: string;
    auth: string;
-    userAgent: string;
  }
 >('/registerPushSubscription', async (req, res, next) => {
  try {
    const userPushSubRepository = getRepository(UserPushSubscription);

    const existingSubs = await userPushSubRepository.find({
-      relations: { user: true },
-      where: { auth: req.body.auth, user: { id: req.user?.id } },
+      where: { auth: req.body.auth },
    });

    if (existingSubs.length > 0) {
@@ -207,7 +205,6 @@ router.post<
      auth: req.body.auth,
      endpoint: req.body.endpoint,
      p256dh: req.body.p256dh,
-      userAgent: req.body.userAgent,
      user: req.user,
    });

@@ -222,79 +219,6 @@ router.post<
  }
 });

-router.get<{ userId: number }>(
-  '/:userId/pushSubscriptions',
-  async (req, res, next) => {
-    try {
-      const userPushSubRepository = getRepository(UserPushSubscription);
-
-      const userPushSubs = await userPushSubRepository.find({
-        relations: { user: true },
-        where: { user: { id: req.params.userId } },
-      });
-
-      return res.status(200).json(userPushSubs);
-    } catch (e) {
-      next({ status: 404, message: 'User subscriptions not found.' });
-    }
-  }
-);
-
-router.get<{ userId: number; key: string }>(
-  '/:userId/pushSubscription/:key',
-  async (req, res, next) => {
-    try {
-      const userPushSubRepository = getRepository(UserPushSubscription);
-
-      const userPushSub = await userPushSubRepository.findOneOrFail({
-        relations: {
-          user: true,
-        },
-        where: {
-          user: { id: req.params.userId },
-          p256dh: req.params.key,
-        },
-      });
-
-      return res.status(200).json(userPushSub);
-    } catch (e) {
-      next({ status: 404, message: 'User subscription not found.' });
-    }
-  }
-);
-
-router.delete<{ userId: number; key: string }>(
-  '/:userId/pushSubscription/:key',
-  async (req, res, next) => {
-    try {
-      const userPushSubRepository = getRepository(UserPushSubscription);
-
-      const userPushSub = await userPushSubRepository.findOneOrFail({
-        relations: {
-          user: true,
-        },
-        where: {
-          user: { id: req.params.userId },
-          p256dh: req.params.key,
-        },
-      });
-
-      await userPushSubRepository.remove(userPushSub);
-      return res.status(204).send();
-    } catch (e) {
-      logger.error('Something went wrong deleting the user push subcription', {
-        label: 'API',
-        key: req.params.key,
-        errorMessage: e.message,
-      });
-      return next({
-        status: 500,
-        message: 'User push subcription not found',
-      });
-    }
-  }
-);
-
 router.get<{ id: string }>('/:id', async (req, res, next) => {
  try {
    const userRepository = getRepository(User);
--- a/server/utils/customProxyAgent.ts
+++ b/server/utils/customProxyAgent.ts
@@ -1,6 +1,5 @@
 import type { ProxySettings } from '@server/lib/settings';
 import logger from '@server/logger';
-import axios from 'axios';
 import type { Dispatcher } from 'undici';
 import { Agent, ProxyAgent, setGlobalDispatcher } from 'undici';

@@ -74,8 +73,15 @@ export default async function createCustomProxyAgent(
  }

  try {
-    await axios.head('https://www.google.com');
-    logger.debug('HTTP(S) proxy connected successfully', { label: 'Proxy' });
+    const res = await fetch('https://www.google.com', { method: 'HEAD' });
+    if (res.ok) {
+      logger.debug('HTTP(S) proxy connected successfully', { label: 'Proxy' });
+    } else {
+      logger.error('Proxy responded, but with a non-OK status: ' + res.status, {
+        label: 'Proxy',
+      });
+      setGlobalDispatcher(defaultAgent);
+    }
  } catch (e) {
    logger.error(
      'Failed to connect to the proxy: ' + e.message + ': ' + e.cause,
--- a/server/utils/rateLimit.ts
+++ b/server/utils/rateLimit.ts
@@ -0,0 +1,68 @@
+export type RateLimitOptions = {
+  maxRPS: number;
+  id?: string;
+};
+
+type RateLimiteState<T extends (...args: Parameters<T>) => Promise<U>, U> = {
+  queue: {
+    args: Parameters<T>;
+    resolve: (value: U) => void;
+    reject: (reason?: unknown) => void;
+  }[];
+  lastTimestamps: number[];
+  timeout: ReturnType<typeof setTimeout>;
+};
+
+const rateLimitById: Record<string, unknown> = {};
+
+/**
+ * Add a rate limit to a function so it doesn't exceed a maximum number of requests per second. Function calls exceeding the rate will be delayed.
+ * @param fn The function to rate limit
+ * @param options.maxRPS Maximum number of Requests Per Second
+ * @param options.id An ID to share between rate limits, so it uses the same request queue.
+ * @returns The function with a rate limit
+ */
+export default function rateLimit<
+  T extends (...args: Parameters<T>) => Promise<U>,
+  U
+>(fn: T, options: RateLimitOptions): (...args: Parameters<T>) => Promise<U> {
+  const state: RateLimiteState<T, U> = (rateLimitById[
+    options.id || ''
+  ] as RateLimiteState<T, U>) || { queue: [], lastTimestamps: [] };
+  if (options.id) {
+    rateLimitById[options.id] = state;
+  }
+
+  const processQueue = () => {
+    // remove old timestamps
+    state.lastTimestamps = state.lastTimestamps.filter(
+      (timestamp) => Date.now() - timestamp < 1000
+    );
+
+    if (state.lastTimestamps.length < options.maxRPS) {
+      // process requests if RPS not exceeded
+      const item = state.queue.shift();
+      if (!item) return;
+      state.lastTimestamps.push(Date.now());
+      const { args, resolve, reject } = item;
+      fn(...args)
+        .then(resolve)
+        .catch(reject);
+      processQueue();
+    } else {
+      // rerun once the oldest item in queue is older than 1s
+      if (state.timeout) clearTimeout(state.timeout);
+      state.timeout = setTimeout(
+        processQueue,
+        1000 - (Date.now() - state.lastTimestamps[0])
+      );
+    }
+  };
+
+  return (...args: Parameters<T>): Promise<U> => {
+    return new Promise<U>((resolve, reject) => {
+      state.queue.push({ args, resolve, reject });
+      processQueue();
+    });
+  };
+}
--- a/server/utils/restartFlag.ts
+++ b/server/utils/restartFlag.ts
@@ -17,7 +17,8 @@ class RestartFlag {
    return (
      this.networkSettings.csrfProtection !== networkSettings.csrfProtection ||
      this.networkSettings.trustProxy !== networkSettings.trustProxy ||
-      this.networkSettings.proxy.enabled !== networkSettings.proxy.enabled
+      this.networkSettings.proxy.enabled !== networkSettings.proxy.enabled ||
+      this.networkSettings.forceIpv4First !== networkSettings.forceIpv4First
    );
  }
 }
--- a/src/components/Blacklist/index.tsx
+++ b/src/components/Blacklist/index.tsx
@@ -1,4 +1,3 @@
-import BlacklistedTagsBadge from '@app/components/BlacklistedTagsBadge';
 import Badge from '@app/components/Common/Badge';
 import Button from '@app/components/Common/Button';
 import CachedImage from '@app/components/Common/CachedImage';
@@ -15,7 +14,6 @@ import defineMessages from '@app/utils/defineMessages';
 import {
  ChevronLeftIcon,
  ChevronRightIcon,
-  FunnelIcon,
  MagnifyingGlassIcon,
  TrashIcon,
 } from '@heroicons/react/24/solid';
@@ -25,7 +23,6 @@ import type {
 } from '@server/interfaces/api/blacklistInterfaces';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
-import axios from 'axios';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
 import type { ChangeEvent } from 'react';
@@ -44,17 +41,8 @@ const messages = defineMessages('components.Blacklist', {
  blacklistdate: 'date',
  blacklistedby: '{date} by {user}',
  blacklistNotFoundError: '<strong>{title}</strong> is not blacklisted.',
-  filterManual: 'Manual',
-  filterBlacklistedTags: 'Blacklisted Tags',
-  showAllBlacklisted: 'Show All Blacklisted Media',
 });

-enum Filter {
-  ALL = 'all',
-  MANUAL = 'manual',
-  BLACKLISTEDTAGS = 'blacklistedTags',
-}
-
 const isMovie = (movie: MovieDetails | TvDetails): movie is MovieDetails => {
  return (movie as MovieDetails).title !== undefined;
 };
@@ -63,7 +51,6 @@ const Blacklist = () => {
  const [currentPageSize, setCurrentPageSize] = useState<number>(10);
  const [searchFilter, debouncedSearchFilter, setSearchFilter] =
    useDebouncedState('');
-  const [currentFilter, setCurrentFilter] = useState<Filter>(Filter.MANUAL);
  const router = useRouter();
  const intl = useIntl();

@@ -76,11 +63,9 @@ const Blacklist = () => {
    error,
    mutate: revalidate,
  } = useSWR<BlacklistResultsResponse>(
-    `/api/v1/blacklist/?take=${currentPageSize}&skip=${
-      pageIndex * currentPageSize
-    }&filter=${currentFilter}${
-      debouncedSearchFilter ? `&search=${debouncedSearchFilter}` : ''
-    }`,
+    `/api/v1/blacklist/?take=${currentPageSize}
+    &skip=${pageIndex * currentPageSize}
+    ${debouncedSearchFilter ? `&search=${debouncedSearchFilter}` : ''}`,
    {
      refreshInterval: 0,
      revalidateOnFocus: false,
@@ -108,52 +93,19 @@ const Blacklist = () => {
  return (
    <>
      <PageTitle title={[intl.formatMessage(globalMessages.blacklist)]} />
-      <div className="mb-4 flex flex-col justify-between lg:flex-row lg:items-end">
-        <Header>{intl.formatMessage(globalMessages.blacklist)}</Header>
+      <Header>{intl.formatMessage(globalMessages.blacklist)}</Header>

-        <div className="mt-2 flex flex-grow flex-col sm:flex-row lg:flex-grow-0">
-          <div className="mb-2 flex flex-grow sm:mb-0 sm:mr-2 lg:flex-grow-0">
-            <span className="inline-flex cursor-default items-center rounded-l-md border border-r-0 border-gray-500 bg-gray-800 px-3 text-sm text-gray-100">
-              <FunnelIcon className="h-6 w-6" />
-            </span>
-            <select
-              id="filter"
-              name="filter"
-              onChange={(e) => {
-                setCurrentFilter(e.target.value as Filter);
-                router.push({
-                  pathname: router.pathname,
-                  query: router.query.userId
-                    ? { userId: router.query.userId }
-                    : {},
-                });
-              }}
-              value={currentFilter}
-              className="rounded-r-only"
-            >
-              <option value="all">
-                {intl.formatMessage(globalMessages.all)}
-              </option>
-              <option value="manual">
-                {intl.formatMessage(messages.filterManual)}
-              </option>
-              <option value="blacklistedTags">
-                {intl.formatMessage(messages.filterBlacklistedTags)}
-              </option>
-            </select>
-          </div>
-
-          <div className="mb-2 flex flex-grow sm:mb-0 sm:mr-2 md:flex-grow-0">
-            <span className="inline-flex cursor-default items-center rounded-l-md border border-r-0 border-gray-500 bg-gray-800 px-3 text-sm text-gray-100">
-              <MagnifyingGlassIcon className="h-6 w-6" />
-            </span>
-            <input
-              type="text"
-              className="rounded-r-only"
-              value={searchFilter}
-              onChange={(e) => searchItem(e)}
-            />
-          </div>
+      <div className="mt-2 flex flex-grow flex-col sm:flex-grow-0 sm:flex-row sm:justify-end">
+        <div className="mb-2 flex flex-grow sm:mb-0 sm:mr-2 md:flex-grow-0">
+          <span className="inline-flex cursor-default items-center rounded-l-md border border-r-0 border-gray-500 bg-gray-800 px-3 text-sm text-gray-100">
+            <MagnifyingGlassIcon className="h-6 w-6" />
+          </span>
+          <input
+            type="text"
+            className="rounded-r-only"
+            value={searchFilter}
+            onChange={(e) => searchItem(e)}
+          />
        </div>
      </div>

@@ -164,16 +116,6 @@ const Blacklist = () => {
          <span className="text-2xl text-gray-400">
            {intl.formatMessage(globalMessages.noresults)}
          </span>
-          {currentFilter !== Filter.ALL && (
-            <div className="mt-4">
-              <Button
-                buttonType="primary"
-                onClick={() => setCurrentFilter(Filter.ALL)}
-              >
-                {intl.formatMessage(messages.showAllBlacklisted)}
-              </Button>
-            </div>
-          )}
        </div>
      ) : (
        data.results.map((item: BlacklistItem) => {
@@ -296,9 +238,11 @@ const BlacklistedItem = ({ item, revalidateList }: BlacklistedItemProps) => {
  const removeFromBlacklist = async (tmdbId: number, title?: string) => {
    setIsUpdating(true);

-    try {
-      await axios.delete(`/api/v1/blacklist/${tmdbId}`);
+    const res = await fetch('/api/v1/blacklist/' + tmdbId, {
+      method: 'DELETE',
+    });

+    if (res.status === 204) {
      addToast(
        <span>
          {intl.formatMessage(globalMessages.removeFromBlacklistSuccess, {
@@ -308,7 +252,7 @@ const BlacklistedItem = ({ item, revalidateList }: BlacklistedItemProps) => {
        </span>,
        { appearance: 'success', autoDismiss: true }
      );
-    } catch {
+    } else {
      addToast(intl.formatMessage(globalMessages.blacklistError), {
        appearance: 'error',
        autoDismiss: true,
@@ -409,7 +353,7 @@ const BlacklistedItem = ({ item, revalidateList }: BlacklistedItemProps) => {
                      numeric="auto"
                    />
                  ),
-                  user: item.user ? (
+                  user: (
                    <Link href={`/users/${item.user.id}`}>
                      <span className="group flex items-center truncate">
                        <CachedImage
@@ -426,14 +370,6 @@ const BlacklistedItem = ({ item, revalidateList }: BlacklistedItemProps) => {
                        </span>
                      </span>
                    </Link>
-                  ) : item.blacklistedTags ? (
-                    <span className="ml-1">
-                      <BlacklistedTagsBadge data={item} />
-                    </span>
-                  ) : (
-                    <span className="ml-1 truncate text-sm font-semibold">
-                      ???
-                    </span>
                  ),
                })}
              </span>
--- a/src/components/BlacklistBlock/index.tsx
+++ b/src/components/BlacklistBlock/index.tsx
@@ -1,4 +1,3 @@
-import BlacklistedTagsBadge from '@app/components/BlacklistedTagsBadge';
 import Badge from '@app/components/Common/Badge';
 import Button from '@app/components/Common/Button';
 import LoadingSpinner from '@app/components/Common/LoadingSpinner';
@@ -8,7 +7,6 @@ import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { CalendarIcon, TrashIcon, UserIcon } from '@heroicons/react/24/solid';
 import type { Blacklist } from '@server/entity/Blacklist';
-import axios from 'axios';
 import Link from 'next/link';
 import { useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -40,9 +38,11 @@ const BlacklistBlock = ({
  const removeFromBlacklist = async (tmdbId: number, title?: string) => {
    setIsUpdating(true);

-    try {
-      await axios.delete('/api/v1/blacklist/' + tmdbId);
+    const res = await fetch('/api/v1/blacklist/' + tmdbId, {
+      method: 'DELETE',
+    });

+    if (res.status === 204) {
      addToast(
        <span>
          {intl.formatMessage(globalMessages.removeFromBlacklistSuccess, {
@@ -52,7 +52,7 @@ const BlacklistBlock = ({
        </span>,
        { appearance: 'success', autoDismiss: true }
      );
-    } catch {
+    } else {
      addToast(intl.formatMessage(globalMessages.blacklistError), {
        appearance: 'error',
        autoDismiss: true,
@@ -78,33 +78,22 @@ const BlacklistBlock = ({
      <div className="flex items-center justify-between">
        <div className="mr-6 min-w-0 flex-1 flex-col items-center text-sm leading-5">
          <div className="white mb-1 flex flex-nowrap">
-            {data.user ? (
-              <>
-                <Tooltip content={intl.formatMessage(messages.blacklistedby)}>
-                  <UserIcon className="mr-1.5 h-5 w-5 min-w-0 flex-shrink-0" />
-                </Tooltip>
-                <span className="w-40 truncate md:w-auto">
-                  <Link
-                    href={
-                      data.user.id === user?.id
-                        ? '/profile'
-                        : `/users/${data.user.id}`
-                    }
-                  >
-                    <span className="font-semibold text-gray-100 transition duration-300 hover:text-white hover:underline">
-                      {data.user.displayName}
-                    </span>
-                  </Link>
+            <Tooltip content={intl.formatMessage(messages.blacklistedby)}>
+              <UserIcon className="mr-1.5 h-5 w-5 min-w-0 flex-shrink-0" />
+            </Tooltip>
+            <span className="w-40 truncate md:w-auto">
+              <Link
+                href={
+                  data.user.id === user?.id
+                    ? '/profile'
+                    : `/users/${data.user.id}`
+                }
+              >
+                <span className="font-semibold text-gray-100 transition duration-300 hover:text-white hover:underline">
+                  {data.user.displayName}
                </span>
-              </>
-            ) : data.blacklistedTags ? (
-              <>
-                <span className="w-40 truncate md:w-auto">
-                  {intl.formatMessage(messages.blacklistedby)}:&nbsp;
-                </span>
-                <BlacklistedTagsBadge data={data} />
-              </>
-            ) : null}
+              </Link>
+            </span>
          </div>
        </div>
        <div className="ml-2 flex flex-shrink-0 flex-wrap">
--- a/src/components/BlacklistModal/index.tsx
+++ b/src/components/BlacklistModal/index.tsx
@@ -4,7 +4,6 @@ import defineMessages from '@app/utils/defineMessages';
 import { Transition } from '@headlessui/react';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
-import axios from 'axios';
 import { useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';

@@ -45,8 +44,12 @@ const BlacklistModal = ({
      if (!show) return;
      try {
        setError(null);
-        const response = await axios.get(`/api/v1/${type}/${tmdbId}`);
-        setData(response.data);
+        const response = await fetch(`/api/v1/${type}/${tmdbId}`);
+        if (!response.ok) {
+          throw new Error();
+        }
+        const result = await response.json();
+        setData(result);
      } catch (err) {
        setError(err);
      }
--- a/src/components/BlacklistedTagsBadge/index.tsx
+++ b/src/components/BlacklistedTagsBadge/index.tsx
@@ -1,62 +0,0 @@
-import Badge from '@app/components/Common/Badge';
-import Tooltip from '@app/components/Common/Tooltip';
-import defineMessages from '@app/utils/defineMessages';
-import { TagIcon } from '@heroicons/react/20/solid';
-import type { BlacklistItem } from '@server/interfaces/api/blacklistInterfaces';
-import type { Keyword } from '@server/models/common';
-import axios from 'axios';
-import { useEffect, useState } from 'react';
-import { useIntl } from 'react-intl';
-
-const messages = defineMessages('components.Settings', {
-  blacklistedTagsText: 'Blacklisted Tags',
-});
-
-interface BlacklistedTagsBadgeProps {
-  data: BlacklistItem;
-}
-
-const BlacklistedTagsBadge = ({ data }: BlacklistedTagsBadgeProps) => {
-  const [tagNamesBlacklistedFor, setTagNamesBlacklistedFor] =
-    useState<string>('Loading...');
-  const intl = useIntl();
-
-  useEffect(() => {
-    if (!data.blacklistedTags) {
-      return;
-    }
-
-    const keywordIds = data.blacklistedTags.slice(1, -1).split(',');
-    Promise.all(
-      keywordIds.map(async (keywordId) => {
-        try {
-          const { data } = await axios.get<Keyword>(
-            `/api/v1/keyword/${keywordId}`
-          );
-          return data.name;
-        } catch (err) {
-          return '';
-        }
-      })
-    ).then((keywords) => {
-      setTagNamesBlacklistedFor(keywords.join(', '));
-    });
-  }, [data.blacklistedTags]);
-
-  return (
-    <Tooltip
-      content={tagNamesBlacklistedFor}
-      tooltipConfig={{ followCursor: false }}
-    >
-      <Badge
-        badgeType="dark"
-        className="items-center border border-red-500 !text-red-400"
-      >
-        <TagIcon className="mr-1 h-4" />
-        {intl.formatMessage(messages.blacklistedTagsText)}
-      </Badge>
-    </Tooltip>
-  );
-};
-
-export default BlacklistedTagsBadge;
--- a/src/components/BlacklistedTagsSelector/index.tsx
+++ b/src/components/BlacklistedTagsSelector/index.tsx
@@ -1,402 +0,0 @@
-import Modal from '@app/components/Common/Modal';
-import Tooltip from '@app/components/Common/Tooltip';
-import CopyButton from '@app/components/Settings/CopyButton';
-import { encodeURIExtraParams } from '@app/hooks/useDiscover';
-import defineMessages from '@app/utils/defineMessages';
-import { Transition } from '@headlessui/react';
-import { ArrowDownIcon } from '@heroicons/react/24/solid';
-import type { TmdbKeywordSearchResponse } from '@server/api/themoviedb/interfaces';
-import type { Keyword } from '@server/models/common';
-import axios from 'axios';
-import { useFormikContext } from 'formik';
-import {
-  forwardRef,
-  useCallback,
-  useEffect,
-  useImperativeHandle,
-  useRef,
-  useState,
-} from 'react';
-import { useIntl } from 'react-intl';
-import type { ClearIndicatorProps, GroupBase, MultiValue } from 'react-select';
-import { components } from 'react-select';
-import AsyncSelect from 'react-select/async';
-
-const messages = defineMessages('components.Settings', {
-  copyBlacklistedTags: 'Copied blacklisted tags to clipboard.',
-  copyBlacklistedTagsTip: 'Copy blacklisted tag configuration',
-  copyBlacklistedTagsEmpty: 'Nothing to copy',
-  importBlacklistedTagsTip: 'Import blacklisted tag configuration',
-  clearBlacklistedTagsConfirm:
-    'Are you sure you want to clear the blacklisted tags?',
-  yes: 'Yes',
-  no: 'No',
-  searchKeywords: 'Search keywords…',
-  starttyping: 'Starting typing to search.',
-  nooptions: 'No results.',
-  blacklistedTagImportTitle: 'Import Blacklisted Tag Configuration',
-  blacklistedTagImportInstructions: 'Paste blacklist tag configuration below.',
-  valueRequired: 'You must provide a value.',
-  noSpecialCharacters:
-    'Configuration must be a comma delimited list of TMDB keyword ids, and must not start or end with a comma.',
-  invalidKeyword: '{keywordId} is not a TMDB keyword.',
-});
-
-type SingleVal = {
-  label: string;
-  value: number;
-};
-
-type BlacklistedTagsSelectorProps = {
-  defaultValue?: string;
-};
-
-const BlacklistedTagsSelector = ({
-  defaultValue,
-}: BlacklistedTagsSelectorProps) => {
-  const { setFieldValue } = useFormikContext();
-  const [value, setValue] = useState<string | undefined>(defaultValue);
-  const intl = useIntl();
-  const [selectorValue, setSelectorValue] =
-    useState<MultiValue<SingleVal> | null>(null);
-
-  const update = useCallback(
-    (value: MultiValue<SingleVal> | null) => {
-      const strVal = value?.map((v) => v.value).join(',');
-      setSelectorValue(value);
-      setValue(strVal);
-      setFieldValue('blacklistedTags', strVal);
-    },
-    [setSelectorValue, setValue, setFieldValue]
-  );
-
-  const copyDisabled = value === null || value?.length === 0;
-
-  return (
-    <>
-      <ControlledKeywordSelector
-        value={selectorValue}
-        onChange={update}
-        defaultValue={defaultValue}
-        components={{
-          DropdownIndicator: undefined,
-          IndicatorSeparator: undefined,
-          ClearIndicator: VerifyClearIndicator,
-        }}
-      />
-
-      <CopyButton
-        textToCopy={value ?? ''}
-        disabled={copyDisabled}
-        toastMessage={intl.formatMessage(messages.copyBlacklistedTags)}
-        tooltipContent={intl.formatMessage(
-          copyDisabled
-            ? messages.copyBlacklistedTagsEmpty
-            : messages.copyBlacklistedTagsTip
-        )}
-        tooltipConfig={{ followCursor: false }}
-      />
-      <BlacklistedTagsImportButton setSelector={update} />
-    </>
-  );
-};
-
-type BaseSelectorMultiProps = {
-  defaultValue?: string;
-  value: MultiValue<SingleVal> | null;
-  onChange: (value: MultiValue<SingleVal> | null) => void;
-  components?: Partial<typeof components>;
-};
-
-const ControlledKeywordSelector = ({
-  defaultValue,
-  onChange,
-  components,
-  value,
-}: BaseSelectorMultiProps) => {
-  const intl = useIntl();
-
-  useEffect(() => {
-    const loadDefaultKeywords = async (): Promise<void> => {
-      if (!defaultValue) {
-        return;
-      }
-
-      const keywords = await Promise.all(
-        defaultValue.split(',').map(async (keywordId) => {
-          const { data } = await axios.get<Keyword>(
-            `/api/v1/keyword/${keywordId}`
-          );
-          return data;
-        })
-      );
-
-      onChange(
-        keywords.map((keyword) => ({
-          label: keyword.name,
-          value: keyword.id,
-        }))
-      );
-    };
-
-    loadDefaultKeywords();
-  }, [defaultValue, onChange]);
-
-  const loadKeywordOptions = async (inputValue: string) => {
-    const { data } = await axios.get<TmdbKeywordSearchResponse>(
-      `/api/v1/search/keyword?query=${encodeURIExtraParams(inputValue)}`
-    );
-
-    return data.results.map((result) => ({
-      label: result.name,
-      value: result.id,
-    }));
-  };
-
-  return (
-    <AsyncSelect
-      key={`keyword-select-blacklistedTags`}
-      inputId="data"
-      isMulti
-      className="react-select-container"
-      classNamePrefix="react-select"
-      noOptionsMessage={({ inputValue }) =>
-        inputValue === ''
-          ? intl.formatMessage(messages.starttyping)
-          : intl.formatMessage(messages.nooptions)
-      }
-      value={value}
-      loadOptions={loadKeywordOptions}
-      placeholder={intl.formatMessage(messages.searchKeywords)}
-      onChange={onChange}
-      components={components}
-    />
-  );
-};
-
-type BlacklistedTagsImportButtonProps = {
-  setSelector: (value: MultiValue<SingleVal>) => void;
-};
-
-const BlacklistedTagsImportButton = ({
-  setSelector,
-}: BlacklistedTagsImportButtonProps) => {
-  const [show, setShow] = useState(false);
-  const formRef = useRef<HTMLFormElement>(null);
-  const intl = useIntl();
-
-  const onConfirm = useCallback(async () => {
-    if (formRef.current) {
-      if (await formRef.current.submitForm()) {
-        setShow(false);
-      }
-    }
-  }, []);
-
-  const onClick = useCallback((event: React.MouseEvent) => {
-    event.stopPropagation();
-    setShow(true);
-  }, []);
-
-  return (
-    <>
-      <Transition
-        as="div"
-        enter="transition-opacity duration-300"
-        enterFrom="opacity-0"
-        enterTo="opacity-100"
-        leave="transition-opacity duration-300"
-        leaveFrom="opacity-100"
-        leaveTo="opacity-0"
-        show={show}
-      >
-        <Modal
-          title={intl.formatMessage(messages.blacklistedTagImportTitle)}
-          okText="Confirm"
-          onOk={onConfirm}
-          onCancel={() => setShow(false)}
-        >
-          <BlacklistedTagImportForm ref={formRef} setSelector={setSelector} />
-        </Modal>
-      </Transition>
-
-      <Tooltip
-        content={intl.formatMessage(messages.importBlacklistedTagsTip)}
-        tooltipConfig={{ followCursor: false }}
-      >
-        <button className="input-action" onClick={onClick} type="button">
-          <ArrowDownIcon />
-        </button>
-      </Tooltip>
-    </>
-  );
-};
-
-type BlacklistedTagImportFormProps = BlacklistedTagsImportButtonProps;
-
-const BlacklistedTagImportForm = forwardRef<
-  Partial<HTMLFormElement>,
-  BlacklistedTagImportFormProps
->((props, ref) => {
-  const { setSelector } = props;
-  const intl = useIntl();
-  const [formValue, setFormValue] = useState('');
-  const [errors, setErrors] = useState<string[]>([]);
-
-  useImperativeHandle(ref, () => ({
-    submitForm: handleSubmit,
-    formValue,
-  }));
-
-  const validate = async () => {
-    if (formValue.length === 0) {
-      setErrors([intl.formatMessage(messages.valueRequired)]);
-      return false;
-    }
-
-    if (!/^(?:\d+,)*\d+$/.test(formValue)) {
-      setErrors([intl.formatMessage(messages.noSpecialCharacters)]);
-      return false;
-    }
-
-    const keywords = await Promise.allSettled(
-      formValue.split(',').map(async (keywordId) => {
-        try {
-          const { data } = await axios.get<Keyword>(
-            `/api/v1/keyword/${keywordId}`
-          );
-          return {
-            label: data.name,
-            value: data.id,
-          };
-        } catch (err) {
-          throw intl.formatMessage(messages.invalidKeyword, { keywordId });
-        }
-      })
-    );
-
-    const failures = keywords.filter(
-      (res) => res.status === 'rejected'
-    ) as PromiseRejectedResult[];
-    if (failures.length > 0) {
-      setErrors(failures.map((failure) => `${failure.reason}`));
-      return false;
-    }
-
-    setSelector(
-      (keywords as PromiseFulfilledResult<SingleVal>[]).map(
-        (keyword) => keyword.value
-      )
-    );
-
-    setErrors([]);
-    return true;
-  };
-
-  const handleSubmit = validate;
-
-  return (
-    <form onSubmit={handleSubmit}>
-      <div>
-        <label htmlFor="value">
-          {intl.formatMessage(messages.blacklistedTagImportInstructions)}
-        </label>
-        <textarea
-          id="value"
-          value={formValue}
-          onChange={(e) => setFormValue(e.target.value)}
-          className="h-20"
-        />
-        {errors.length > 0 && (
-          <div className="error">
-            {errors.map((error) => (
-              <div key={error}>{error}</div>
-            ))}
-          </div>
-        )}
-      </div>
-    </form>
-  );
-});
-
-const VerifyClearIndicator = <
-  Option,
-  IsMuti extends boolean,
-  Group extends GroupBase<Option>
->(
-  props: ClearIndicatorProps<Option, IsMuti, Group>
-) => {
-  const { clearValue } = props;
-  const [show, setShow] = useState(false);
-  const intl = useIntl();
-
-  const openForm = useCallback(() => {
-    setShow(true);
-  }, [setShow]);
-
-  const openFormKey = useCallback(
-    (event: React.KeyboardEvent) => {
-      if (show) return;
-
-      if (event.key === 'Enter' || event.key === 'Space') {
-        setShow(true);
-      }
-    },
-    [setShow, show]
-  );
-
-  const acceptForm = useCallback(
-    (event: KeyboardEvent) => {
-      if (event.key === 'Enter') {
-        event.stopPropagation();
-        event.preventDefault();
-        clearValue();
-      }
-    },
-    [clearValue]
-  );
-
-  useEffect(() => {
-    if (show) {
-      window.addEventListener('keydown', acceptForm);
-    }
-
-    return () => window.removeEventListener('keydown', acceptForm);
-  }, [show, acceptForm]);
-
-  return (
-    <>
-      <button
-        type="button"
-        onClick={openForm}
-        onKeyDown={openFormKey}
-        className="react-select__indicator react-select__clear-indicator css-1xc3v61-indicatorContainer cursor-pointer"
-      >
-        <components.CrossIcon />
-      </button>
-      <Transition
-        as="div"
-        enter="transition-opacity duration-300"
-        enterFrom="opacity-0"
-        enterTo="opacity-100"
-        leave="transition-opacity duration-300"
-        leaveFrom="opacity-100"
-        leaveTo="opacity-0"
-        show={show}
-      >
-        <Modal
-          subTitle={intl.formatMessage(messages.clearBlacklistedTagsConfirm)}
-          okText={intl.formatMessage(messages.yes)}
-          cancelText={intl.formatMessage(messages.no)}
-          onOk={clearValue}
-          onCancel={() => setShow(false)}
-        >
-          <form />{' '}
-          {/* Form prevents accidentally saving settings when pressing enter */}
-        </Modal>
-      </Transition>
-    </>
-  );
-};
-
-export default BlacklistedTagsSelector;
--- a/src/components/Common/SensitiveInput/index.tsx
+++ b/src/components/Common/SensitiveInput/index.tsx
@@ -29,6 +29,7 @@ const SensitiveInput = ({ as = 'input', ...props }: SensitiveInputProps) => {
        data-form-type="other"
        data-1pignore="true"
        data-lpignore="true"
+        data-bwignore="true"
        {...componentProps}
        className={`rounded-l-only ${componentProps.className ?? ''}`}
        type={
--- a/src/components/Discover/CreateSlider/index.tsx
+++ b/src/components/Discover/CreateSlider/index.tsx
@@ -14,7 +14,6 @@ import { DiscoverSliderType } from '@server/constants/discover';
 import type DiscoverSlider from '@server/entity/DiscoverSlider';
 import type { GenreSliderItem } from '@server/interfaces/api/discoverInterfaces';
 import type { Keyword, ProductionCompany } from '@server/models/common';
-import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import { useCallback, useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -77,11 +76,9 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {

        const keywords = await Promise.all(
          slider.data.split(',').map(async (keywordId) => {
-            const keyword = await axios.get<Keyword>(
-              `/api/v1/keyword/${keywordId}`
-            );
-
-            return keyword.data;
+            const res = await fetch(`/api/v1/keyword/${keywordId}`);
+            const keyword: Keyword = await res.json();
+            return keyword;
          })
        );

@@ -98,15 +95,13 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
          return;
        }

-        const response = await axios.get<TmdbGenre[]>(
+        const res = await fetch(
          `/api/v1/genres/${
            slider.type === DiscoverSliderType.TMDB_MOVIE_GENRE ? 'movie' : 'tv'
          }`
        );
-
-        const genre = response.data.find(
-          (genre) => genre.id === Number(slider.data)
-        );
+        const genres: TmdbGenre[] = await res.json();
+        const genre = genres.find((genre) => genre.id === Number(slider.data));

        setDefaultDataValue([
          {
@@ -121,11 +116,8 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
          return;
        }

-        const response = await axios.get<ProductionCompany>(
-          `/api/v1/studio/${slider.data}`
-        );
-
-        const studio = response.data;
+        const res = await fetch(`/api/v1/studio/${slider.data}`);
+        const studio: ProductionCompany = await res.json();

        setDefaultDataValue([
          {
@@ -168,16 +160,17 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
  );

  const loadKeywordOptions = async (inputValue: string) => {
-    const results = await axios.get<TmdbKeywordSearchResponse>(
-      '/api/v1/search/keyword',
+    const res = await fetch(
+      `/api/v1/search/keyword?query=${encodeURIExtraParams(inputValue)}`,
      {
-        params: {
-          query: encodeURIExtraParams(inputValue),
+        headers: {
+          'Content-Type': 'application/json',
        },
      }
    );
+    const results: TmdbKeywordSearchResponse = await res.json();

-    return results.data.results.map((result) => ({
+    return results.results.map((result) => ({
      label: result.name,
      value: result.id,
    }));
@@ -188,38 +181,37 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
      return [];
    }

-    const results = await axios.get<TmdbCompanySearchResponse>(
-      '/api/v1/search/company',
+    const res = await fetch(
+      `/api/v1/search/company?query=${encodeURIExtraParams(inputValue)}`,
      {
-        params: {
-          query: encodeURIExtraParams(inputValue),
+        headers: {
+          'Content-Type': 'application/json',
        },
      }
    );
+    const results: TmdbCompanySearchResponse = await res.json();

-    return results.data.results.map((result) => ({
+    return results.results.map((result) => ({
      label: result.name,
      value: result.id,
    }));
  };

  const loadMovieGenreOptions = async () => {
-    const results = await axios.get<GenreSliderItem[]>(
-      '/api/v1/discover/genreslider/movie'
-    );
+    const res = await fetch('/api/v1/discover/genreslider/movie');
+    const results: GenreSliderItem[] = await res.json();

-    return results.data.map((result) => ({
+    return results.map((result) => ({
      label: result.name,
      value: result.id,
    }));
  };

  const loadTvGenreOptions = async () => {
-    const results = await axios.get<GenreSliderItem[]>(
-      '/api/v1/discover/genreslider/tv'
-    );
+    const res = await fetch('/api/v1/discover/genreslider/tv');
+    const results: GenreSliderItem[] = await res.json();

-    return results.data.map((result) => ({
+    return results.map((result) => ({
      label: result.name,
      value: result.id,
    }));
@@ -314,17 +306,31 @@ const CreateSlider = ({ onCreate, slider }: CreateSliderProps) => {
      onSubmit={async (values, { resetForm }) => {
        try {
          if (slider) {
-            await axios.put(`/api/v1/settings/discover/${slider.id}`, {
-              type: Number(values.sliderType),
-              title: values.title,
-              data: values.data,
+            const res = await fetch(`/api/v1/settings/discover/${slider.id}`, {
+              method: 'PUT',
+              headers: {
+                'Content-Type': 'application/json',
+              },
+              body: JSON.stringify({
+                type: Number(values.sliderType),
+                title: values.title,
+                data: values.data,
+              }),
            });
+            if (!res.ok) throw new Error();
          } else {
-            await axios.post('/api/v1/settings/discover/add', {
-              type: Number(values.sliderType),
-              title: values.title,
-              data: values.data,
+            const res = await fetch('/api/v1/settings/discover/add', {
+              method: 'POST',
+              headers: {
+                'Content-Type': 'application/json',
+              },
+              body: JSON.stringify({
+                type: Number(values.sliderType),
+                title: values.title,
+                data: values.data,
+              }),
            });
+            if (!res.ok) throw new Error();
          }

          addToast(
--- a/src/components/Discover/DiscoverSliderEdit/index.tsx
+++ b/src/components/Discover/DiscoverSliderEdit/index.tsx
@@ -20,7 +20,6 @@ import {
 } from '@heroicons/react/24/solid';
 import { DiscoverSliderType } from '@server/constants/discover';
 import type DiscoverSlider from '@server/entity/DiscoverSlider';
-import axios from 'axios';
 import { useRef, useState } from 'react';
 import { useDrag, useDrop } from 'react-aria';
 import { useIntl } from 'react-intl';
@@ -78,7 +77,10 @@ const DiscoverSliderEdit = ({

  const deleteSlider = async () => {
    try {
-      await axios.delete(`/api/v1/settings/discover/${slider.id}`);
+      const res = await fetch(`/api/v1/settings/discover/${slider.id}`, {
+        method: 'DELETE',
+      });
+      if (!res.ok) throw new Error();
      addToast(intl.formatMessage(messages.deletesuccess), {
        appearance: 'success',
        autoDismiss: true,
--- a/src/components/Discover/index.tsx
+++ b/src/components/Discover/index.tsx
@@ -28,7 +28,6 @@ import {
 } from '@heroicons/react/24/solid';
 import { DiscoverSliderType } from '@server/constants/discover';
 import type DiscoverSlider from '@server/entity/DiscoverSlider';
-import axios from 'axios';
 import { useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
@@ -76,7 +75,14 @@ const Discover = () => {

  const updateSliders = async () => {
    try {
-      await axios.post('/api/v1/settings/discover', sliders);
+      const res = await fetch('/api/v1/settings/discover', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(sliders),
+      });
+      if (!res.ok) throw new Error();

      addToast(intl.formatMessage(messages.updatesuccess), {
        appearance: 'success',
@@ -94,7 +100,10 @@ const Discover = () => {

  const resetSliders = async () => {
    try {
-      await axios.get('/api/v1/settings/discover/reset');
+      const res = await fetch('/api/v1/settings/discover/reset', {
+        method: 'GET',
+      });
+      if (!res.ok) throw new Error();

      addToast(intl.formatMessage(messages.resetsuccess), {
        appearance: 'success',
--- a/src/components/IssueDetails/IssueComment/index.tsx
+++ b/src/components/IssueDetails/IssueComment/index.tsx
@@ -6,7 +6,6 @@ import defineMessages from '@app/utils/defineMessages';
 import { Menu, Transition } from '@headlessui/react';
 import { EllipsisVerticalIcon } from '@heroicons/react/24/solid';
 import type { default as IssueCommentType } from '@server/entity/IssueComment';
-import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import Link from 'next/link';
 import { Fragment, useState } from 'react';
@@ -49,7 +48,10 @@ const IssueComment = ({

  const deleteComment = async () => {
    try {
-      await axios.delete(`/api/v1/issueComment/${comment.id}`);
+      const res = await fetch(`/api/v1/issueComment/${comment.id}`, {
+        method: 'DELETE',
+      });
+      if (!res.ok) throw new Error();
    } catch (e) {
      // something went wrong deleting the comment
    } finally {
@@ -176,9 +178,17 @@ const IssueComment = ({
              <Formik
                initialValues={{ newMessage: comment.message }}
                onSubmit={async (values) => {
-                  await axios.put(`/api/v1/issueComment/${comment.id}`, {
-                    message: values.newMessage,
-                  });
+                  const res = await fetch(
+                    `/api/v1/issueComment/${comment.id}`,
+                    {
+                      method: 'PUT',
+                      headers: {
+                        'Content-Type': 'application/json',
+                      },
+                      body: JSON.stringify({ message: values.newMessage }),
+                    }
+                  );
+                  if (!res.ok) throw new Error();

                  if (onUpdate) {
                    onUpdate();
--- a/src/components/IssueDetails/index.tsx
+++ b/src/components/IssueDetails/index.tsx
@@ -27,7 +27,6 @@ import { MediaServerType } from '@server/constants/server';
 import type Issue from '@server/entity/Issue';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
-import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
@@ -122,9 +121,14 @@ const IssueDetails = () => {

  const editFirstComment = async (newMessage: string) => {
    try {
-      await axios.put(`/api/v1/issueComment/${firstComment.id}`, {
-        message: newMessage,
+      const res = await fetch(`/api/v1/issueComment/${firstComment.id}`, {
+        method: 'PUT',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ message: newMessage }),
      });
+      if (!res.ok) throw new Error();

      addToast(intl.formatMessage(messages.toasteditdescriptionsuccess), {
        appearance: 'success',
@@ -141,7 +145,10 @@ const IssueDetails = () => {

  const updateIssueStatus = async (newStatus: 'open' | 'resolved') => {
    try {
-      await axios.post(`/api/v1/issue/${issueData.id}/${newStatus}`);
+      const res = await fetch(`/api/v1/issue/${issueData.id}/${newStatus}`, {
+        method: 'POST',
+      });
+      if (!res.ok) throw new Error();

      addToast(intl.formatMessage(messages.toaststatusupdated), {
        appearance: 'success',
@@ -159,7 +166,10 @@ const IssueDetails = () => {

  const deleteIssue = async () => {
    try {
-      await axios.delete(`/api/v1/issue/${issueData.id}`);
+      const res = await fetch(`/api/v1/issue/${issueData.id}`, {
+        method: 'DELETE',
+      });
+      if (!res.ok) throw new Error();
      mutate('/api/v1/issue/count');

      addToast(intl.formatMessage(messages.toastissuedeleted), {
@@ -494,9 +504,17 @@ const IssueDetails = () => {
                }}
                validationSchema={CommentSchema}
                onSubmit={async (values, { resetForm }) => {
-                  await axios.post(`/api/v1/issue/${issueData?.id}/comment`, {
-                    message: values.message,
-                  });
+                  const res = await fetch(
+                    `/api/v1/issue/${issueData?.id}/comment`,
+                    {
+                      method: 'POST',
+                      headers: {
+                        'Content-Type': 'application/json',
+                      },
+                      body: JSON.stringify({ message: values.message }),
+                    }
+                  );
+                  if (!res.ok) throw new Error();
                  revalidateIssue();
                  resetForm();
                }}
--- a/src/components/IssueModal/CreateIssueModal/index.tsx
+++ b/src/components/IssueModal/CreateIssueModal/index.tsx
@@ -11,7 +11,6 @@ import { MediaStatus } from '@server/constants/media';
 import type Issue from '@server/entity/Issue';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
-import axios from 'axios';
 import { Field, Formik } from 'formik';
 import Link from 'next/link';
 import { useIntl } from 'react-intl';
@@ -101,14 +100,22 @@ const CreateIssueModal = ({
      validationSchema={CreateIssueModalSchema}
      onSubmit={async (values) => {
        try {
-          const newIssue = await axios.post<Issue>('/api/v1/issue', {
-            issueType: values.selectedIssue.issueType,
-            message: values.message,
-            mediaId: data?.mediaInfo?.id,
-            problemSeason: values.problemSeason,
-            problemEpisode:
-              values.problemSeason > 0 ? values.problemEpisode : 0,
+          const res = await fetch('/api/v1/issue', {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+              issueType: values.selectedIssue.issueType,
+              message: values.message,
+              mediaId: data?.mediaInfo?.id,
+              problemSeason: values.problemSeason,
+              problemEpisode:
+                values.problemSeason > 0 ? values.problemEpisode : 0,
+            }),
          });
+          if (!res.ok) throw new Error();
+          const newIssue: Issue = await res.json();

          if (data) {
            addToast(
@@ -119,7 +126,7 @@ const CreateIssueModal = ({
                    strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
                  })}
                </div>
-                <Link href={`/issues/${newIssue.data.id}`} legacyBehavior>
+                <Link href={`/issues/${newIssue.id}`} legacyBehavior>
                  <Button as="a" className="mt-4">
                    <span>{intl.formatMessage(messages.toastviewissue)}</span>
                    <ArrowRightCircleIcon />
--- a/src/components/Layout/MobileMenu/index.tsx
+++ b/src/components/Layout/MobileMenu/index.tsx
@@ -255,9 +255,7 @@ const MobileMenu = ({
                            router.pathname.match(link.activeRegExp)
                              ? 'border-indigo-600 from-indigo-700 to-purple-700'
                              : 'border-indigo-500 from-indigo-600 to-purple-600'
-                          } flex ${
-                            pendingRequestsCount > 99 ? 'w-6' : 'w-4'
-                          } h-4  items-center justify-center !px-[5px] !py-[7px] text-[8px]`}
+                          } flex h-4 w-4 items-center justify-center !px-[9px] !py-[9px] text-[9px]`}
                        >
                          {pendingRequestsCount > 99
                            ? '99+'
--- a/src/components/Layout/UserDropdown/index.tsx
+++ b/src/components/Layout/UserDropdown/index.tsx
@@ -8,7 +8,6 @@ import {
  ClockIcon,
 } from '@heroicons/react/24/outline';
 import { CogIcon, UserIcon } from '@heroicons/react/24/solid';
-import axios from 'axios';
 import type { LinkProps } from 'next/link';
 import Link from 'next/link';
 import { forwardRef, Fragment } from 'react';
@@ -39,9 +38,13 @@ const UserDropdown = () => {
  const { user, revalidate } = useUser();

  const logout = async () => {
-    const response = await axios.post('/api/v1/auth/logout');
+    const res = await fetch('/api/v1/auth/logout', {
+      method: 'POST',
+    });
+    if (!res.ok) throw new Error();
+    const data = await res.json();

-    if (response.data?.status === 'ok') {
+    if (data?.status === 'ok') {
      revalidate();
    }
  };
--- a/src/components/Login/AddEmailModal.tsx
+++ b/src/components/Login/AddEmailModal.tsx
@@ -2,7 +2,6 @@ import Modal from '@app/components/Common/Modal';
 import useSettings from '@app/hooks/useSettings';
 import defineMessages from '@app/utils/defineMessages';
 import { Transition } from '@headlessui/react';
-import axios from 'axios';
 import { Field, Formik } from 'formik';
 import { useIntl } from 'react-intl';
 import * as Yup from 'yup';
@@ -58,11 +57,18 @@ const AddEmailModal: React.FC<AddEmailModalProps> = ({
        validationSchema={EmailSettingsSchema}
        onSubmit={async (values) => {
          try {
-            await axios.post('/api/v1/auth/jellyfin', {
-              username: username,
-              password: password,
-              email: values.email,
+            const res = await fetch('/api/v1/auth/jellyfin', {
+              method: 'POST',
+              headers: {
+                'Content-Type': 'application/json',
+              },
+              body: JSON.stringify({
+                username: username,
+                password: password,
+                email: values.email,
+              }),
            });
+            if (!res.ok) throw new Error();

            onSave();
          } catch (e) {
--- a/src/components/Login/JellyfinLogin.tsx
+++ b/src/components/Login/JellyfinLogin.tsx
@@ -5,7 +5,6 @@ import defineMessages from '@app/utils/defineMessages';
 import { ArrowLeftOnRectangleIcon } from '@heroicons/react/24/outline';
 import { ApiErrorCode } from '@server/constants/error';
 import { MediaServerType, ServerType } from '@server/constants/server';
-import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
@@ -72,14 +71,28 @@ const JellyfinLogin: React.FC<JellyfinLoginProps> = ({
        validateOnBlur={false}
        onSubmit={async (values) => {
          try {
-            await axios.post('/api/v1/auth/jellyfin', {
-              username: values.username,
-              password: values.password,
-              email: values.username,
+            const res = await fetch('/api/v1/auth/jellyfin', {
+              method: 'POST',
+              headers: {
+                'Content-Type': 'application/json',
+              },
+              body: JSON.stringify({
+                username: values.username,
+                password: values.password,
+                email: values.username,
+              }),
            });
+            if (!res.ok) throw new Error(res.statusText, { cause: res });
          } catch (e) {
+            let errorData;
+            try {
+              errorData = await e.cause?.text();
+              errorData = JSON.parse(errorData);
+            } catch {
+              /* empty */
+            }
            let errorMessage = null;
-            switch (e?.response?.data?.message) {
+            switch (errorData?.message) {
              case ApiErrorCode.InvalidUrl:
                errorMessage = messages.invalidurlerror;
                break;
--- a/src/components/Login/LocalLogin.tsx
+++ b/src/components/Login/LocalLogin.tsx
@@ -3,7 +3,6 @@ import SensitiveInput from '@app/components/Common/SensitiveInput';
 import useSettings from '@app/hooks/useSettings';
 import defineMessages from '@app/utils/defineMessages';
 import { ArrowLeftOnRectangleIcon } from '@heroicons/react/24/outline';
-import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import Link from 'next/link';
 import { useState } from 'react';
@@ -55,10 +54,17 @@ const LocalLogin = ({ revalidate }: LocalLoginProps) => {
      validateOnBlur={false}
      onSubmit={async (values) => {
        try {
-          await axios.post('/api/v1/auth/local', {
-            email: values.email,
-            password: values.password,
+          const res = await fetch('/api/v1/auth/local', {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+              email: values.email,
+              password: values.password,
+            }),
          });
+          if (!res.ok) throw new Error();
        } catch (e) {
          setLoginError(intl.formatMessage(messages.loginerror));
        } finally {
--- a/src/components/Login/index.tsx
+++ b/src/components/Login/index.tsx
@@ -14,7 +14,6 @@ import defineMessages from '@app/utils/defineMessages';
 import { Transition } from '@headlessui/react';
 import { XCircleIcon } from '@heroicons/react/24/solid';
 import { MediaServerType } from '@server/constants/server';
-import axios from 'axios';
 import { useRouter } from 'next/dist/client/router';
 import Image from 'next/image';
 import { useEffect, useRef, useState } from 'react';
@@ -51,13 +50,28 @@ const Login = () => {
    const login = async () => {
      setProcessing(true);
      try {
-        const response = await axios.post('/api/v1/auth/plex', { authToken });
+        const res = await fetch('/api/v1/auth/plex', {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify({ authToken }),
+        });
+        if (!res.ok) throw new Error(res.statusText, { cause: res });
+        const data = await res.json();

-        if (response.data?.id) {
+        if (data?.id) {
          revalidate();
        }
      } catch (e) {
-        setError(e.response?.data?.message);
+        let errorData;
+        try {
+          errorData = await e.cause?.text();
+          errorData = JSON.parse(errorData);
+        } catch {
+          /* empty */
+        }
+        setError(errorData?.message);
        setAuthToken(undefined);
        setProcessing(false);
      }
--- a/src/components/ManageSlideOver/index.tsx
+++ b/src/components/ManageSlideOver/index.tsx
@@ -28,7 +28,6 @@ import type { MediaWatchDataResponse } from '@server/interfaces/api/mediaInterfa
 import type { RadarrSettings, SonarrSettings } from '@server/lib/settings';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
-import axios from 'axios';
 import Link from 'next/link';
 import { useIntl } from 'react-intl';
 import useSWR from 'swr';
@@ -112,7 +111,10 @@ const ManageSlideOver = ({

  const deleteMedia = async () => {
    if (data.mediaInfo) {
-      await axios.delete(`/api/v1/media/${data.mediaInfo.id}`);
+      const res = await fetch(`/api/v1/media/${data.mediaInfo.id}`, {
+        method: 'DELETE',
+      });
+      if (!res.ok) throw new Error();
      revalidate();
      onClose();
    }
@@ -120,8 +122,14 @@ const ManageSlideOver = ({

  const deleteMediaFile = async () => {
    if (data.mediaInfo) {
-      await axios.delete(`/api/v1/media/${data.mediaInfo.id}/file`);
-      await axios.delete(`/api/v1/media/${data.mediaInfo.id}`);
+      // we don't check if the response is ok here because there may be no file to delete
+      await fetch(`/api/v1/media/${data.mediaInfo.id}/file`, {
+        method: 'DELETE',
+      });
+      await fetch(`/api/v1/media/${data.mediaInfo.id}`, {
+        method: 'DELETE',
+      });
+
      revalidate();
      onClose();
    }
@@ -150,9 +158,16 @@ const ManageSlideOver = ({

  const markAvailable = async (is4k = false) => {
    if (data.mediaInfo) {
-      await axios.post(`/api/v1/media/${data.mediaInfo?.id}/available`, {
-        is4k,
+      const res = await fetch(`/api/v1/media/${data.mediaInfo?.id}/available`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+          is4k,
+        }),
      });
+      if (!res.ok) throw new Error();
      revalidate();
    }
  };
--- a/src/components/MovieDetails/index.tsx
+++ b/src/components/MovieDetails/index.tsx
@@ -52,7 +52,6 @@ import { IssueStatus } from '@server/constants/issue';
 import { MediaStatus, MediaType } from '@server/constants/media';
 import { MediaServerType } from '@server/constants/server';
 import type { MovieDetails as MovieDetailsType } from '@server/models/Movie';
-import axios from 'axios';
 import { countries } from 'country-flag-icons';
 import 'country-flag-icons/3x2/flags.css';
 import { uniqBy } from 'lodash';
@@ -320,29 +319,41 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
  const onClickWatchlistBtn = async (): Promise<void> => {
    setIsUpdating(true);

-    try {
-      const response = await axios.post('/api/v1/watchlist', {
+    const res = await fetch('/api/v1/watchlist', {
+      method: 'POST',
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
        tmdbId: movie?.id,
        mediaType: MediaType.MOVIE,
        title: movie?.title,
-      });
+      }),
+    });

-      if (response.data) {
-        addToast(
-          <span>
-            {intl.formatMessage(messages.watchlistSuccess, {
-              title: movie?.title,
-              strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
-            })}
-          </span>,
-          { appearance: 'success', autoDismiss: true }
-        );
-      }
-    } catch (e) {
+    if (!res.ok) {
      addToast(intl.formatMessage(messages.watchlistError), {
        appearance: 'error',
        autoDismiss: true,
      });
+
+      setIsUpdating(false);
+      return;
+    }
+
+    const data = await res.json();
+
+    if (data) {
+      addToast(
+        <span>
+          {intl.formatMessage(messages.watchlistSuccess, {
+            title: movie?.title,
+            strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
+          })}
+        </span>,
+        { appearance: 'success', autoDismiss: true }
+      );
    }

    setIsUpdating(false);
@@ -352,17 +363,22 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
  const onClickDeleteWatchlistBtn = async (): Promise<void> => {
    setIsUpdating(true);
    try {
-      await axios.delete(`/api/v1/watchlist/${movie?.id}`);
+      const res = await fetch(`/api/v1/watchlist/${movie?.id}`, {
+        method: 'DELETE',
+      });
+      if (!res.ok) throw new Error();

-      addToast(
-        <span>
-          {intl.formatMessage(messages.watchlistDeleted, {
-            title: movie?.title,
-            strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
-          })}
-        </span>,
-        { appearance: 'info', autoDismiss: true }
-      );
+      if (res.status === 204) {
+        addToast(
+          <span>
+            {intl.formatMessage(messages.watchlistDeleted, {
+              title: movie?.title,
+              strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
+            })}
+          </span>,
+          { appearance: 'info', autoDismiss: true }
+        );
+      }
    } catch (e) {
      addToast(intl.formatMessage(messages.watchlistError), {
        appearance: 'error',
@@ -377,14 +393,21 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
  const onClickHideItemBtn = async (): Promise<void> => {
    setIsBlacklistUpdating(true);

-    try {
-      await axios.post('/api/v1/blacklist', {
+    const res = await fetch('/api/v1/blacklist', {
+      method: 'POST',
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
        tmdbId: movie?.id,
        mediaType: 'movie',
        title: movie?.title,
        user: user?.id,
-      });
+      }),
+    });

+    if (res.status === 201) {
      addToast(
        <span>
          {intl.formatMessage(globalMessages.blacklistSuccess, {
@@ -396,23 +419,21 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
      );

      revalidate();
-    } catch (e) {
-      if (e?.response?.status === 412) {
-        addToast(
-          <span>
-            {intl.formatMessage(globalMessages.blacklistDuplicateError, {
-              title: movie?.title,
-              strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
-            })}
-          </span>,
-          { appearance: 'info', autoDismiss: true }
-        );
-      } else {
-        addToast(intl.formatMessage(globalMessages.blacklistError), {
-          appearance: 'error',
-          autoDismiss: true,
-        });
-      }
+    } else if (res.status === 412) {
+      addToast(
+        <span>
+          {intl.formatMessage(globalMessages.blacklistDuplicateError, {
+            title: movie?.title,
+            strong: (msg: React.ReactNode) => <strong>{msg}</strong>,
+          })}
+        </span>,
+        { appearance: 'info', autoDismiss: true }
+      );
+    } else {
+      addToast(intl.formatMessage(globalMessages.blacklistError), {
+        appearance: 'error',
+        autoDismiss: true,
+      });
    }

    setIsBlacklistUpdating(false);
--- a/src/components/RequestBlock/index.tsx
+++ b/src/components/RequestBlock/index.tsx
@@ -17,7 +17,6 @@ import {
 } from '@heroicons/react/24/solid';
 import { MediaRequestStatus } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
-import axios from 'axios';
 import Link from 'next/link';
 import { useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -54,7 +53,10 @@ const RequestBlock = ({ request, onUpdate }: RequestBlockProps) => {

  const updateRequest = async (type: 'approve' | 'decline'): Promise<void> => {
    setIsUpdating(true);
-    await axios.post(`/api/v1/request/${request.id}/${type}`);
+    const res = await fetch(`/api/v1/request/${request.id}/${type}`, {
+      method: 'POST',
+    });
+    if (!res.ok) throw new Error();

    if (onUpdate) {
      onUpdate();
@@ -65,7 +67,10 @@ const RequestBlock = ({ request, onUpdate }: RequestBlockProps) => {

  const deleteRequest = async () => {
    setIsUpdating(true);
-    await axios.delete(`/api/v1/request/${request.id}`);
+    const res = await fetch(`/api/v1/request/${request.id}`, {
+      method: 'DELETE',
+    });
+    if (!res.ok) throw new Error();

    if (onUpdate) {
      onUpdate();
--- a/src/components/RequestButton/index.tsx
+++ b/src/components/RequestButton/index.tsx
@@ -13,7 +13,6 @@ import {
 import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
 import type Media from '@server/entity/Media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
-import axios from 'axios';
 import { useMemo, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { mutate } from 'swr';
@@ -95,9 +94,13 @@ const RequestButton = ({
    request: MediaRequest,
    type: 'approve' | 'decline'
  ) => {
-    const response = await axios.post(`/api/v1/request/${request.id}/${type}`);
+    const res = await fetch(`/api/v1/request/${request.id}/${type}`, {
+      method: 'POST',
+    });
+    if (!res.ok) throw new Error();
+    const data = await res.json();

-    if (response) {
+    if (data) {
      onUpdate();
      mutate('/api/v1/request/count');
    }
@@ -113,7 +116,11 @@ const RequestButton = ({

    await Promise.all(
      requests.map(async (request) => {
-        return axios.post(`/api/v1/request/${request.id}/${type}`);
+        const res = await fetch(`/api/v1/request/${request.id}/${type}`, {
+          method: 'POST',
+        });
+        if (!res.ok) throw new Error();
+        return res.json();
      })
    );

--- a/src/components/RequestCard/index.tsx
+++ b/src/components/RequestCard/index.tsx
@@ -23,7 +23,6 @@ import type { MediaRequest } from '@server/entity/MediaRequest';
 import type { NonFunctionProperties } from '@server/interfaces/api/common';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
-import axios from 'axios';
 import Link from 'next/link';
 import { useEffect, useState } from 'react';
 import { useInView } from 'react-intersection-observer';
@@ -75,7 +74,10 @@ const RequestCardError = ({ requestData }: RequestCardErrorProps) => {
  });

  const deleteRequest = async () => {
-    await axios.delete(`/api/v1/media/${requestData?.media.id}`);
+    const res = await fetch(`/api/v1/media/${requestData?.media.id}`, {
+      method: 'DELETE',
+    });
+    if (!res.ok) throw new Error();
    mutate('/api/v1/media?filter=allavailable&take=20&sort=mediaAdded');
    mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
    mutate('/api/v1/request/count');
@@ -262,16 +264,23 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
  });

  const modifyRequest = async (type: 'approve' | 'decline') => {
-    const response = await axios.post(`/api/v1/request/${request.id}/${type}`);
+    const res = await fetch(`/api/v1/request/${request.id}/${type}`, {
+      method: 'POST',
+    });
+    if (!res.ok) throw new Error();
+    const data = await res.json();

-    if (response) {
+    if (data) {
      revalidate();
      mutate('/api/v1/request/count');
    }
  };

  const deleteRequest = async () => {
-    await axios.delete(`/api/v1/request/${request.id}`);
+    const res = await fetch(`/api/v1/request/${request.id}`, {
+      method: 'DELETE',
+    });
+    if (!res.ok) throw new Error();
    mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
    mutate('/api/v1/request/count');
  };
@@ -280,9 +289,13 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
    setRetrying(true);

    try {
-      const response = await axios.post(`/api/v1/request/${request.id}/retry`);
+      const res = await fetch(`/api/v1/request/${request.id}/retry`, {
+        method: 'POST',
+      });
+      if (!res.ok) throw new Error();
+      const data = await res.json();

-      if (response) {
+      if (data) {
        revalidate();
      }
    } catch (e) {
--- a/src/components/RequestList/RequestItem/index.tsx
+++ b/src/components/RequestList/RequestItem/index.tsx
@@ -17,13 +17,12 @@ import {
  TrashIcon,
  XMarkIcon,
 } from '@heroicons/react/24/solid';
-import { MediaRequestStatus } from '@server/constants/media';
+import { MediaRequestStatus, MediaType } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
 import type { NonFunctionProperties } from '@server/interfaces/api/common';
-import type { RequestResultsResponse } from '@server/interfaces/api/requestInterfaces';
+import type { RadarrSettings, SonarrSettings } from '@server/lib/settings';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
-import axios from 'axios';
 import Link from 'next/link';
 import { useState } from 'react';
 import { useInView } from 'react-intersection-observer';
@@ -66,7 +65,10 @@ const RequestItemError = ({
  const { hasPermission } = useUser();

  const deleteRequest = async () => {
-    await axios.delete(`/api/v1/media/${requestData?.media.id}`);
+    const res = await fetch(`/api/v1/media/${requestData?.media.id}`, {
+      method: 'DELETE',
+    });
+    if (!res.ok) throw new Error();
    revalidateList();
    mutate('/api/v1/request/count');
  };
@@ -290,11 +292,18 @@ const RequestItemError = ({
 };

 interface RequestItemProps {
-  request: RequestResultsResponse['results'][number];
+  request: NonFunctionProperties<MediaRequest> & { profileName?: string };
  revalidateList: () => void;
+  radarrData?: RadarrSettings[];
+  sonarrData?: SonarrSettings[];
 }

-const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
+const RequestItem = ({
+  request,
+  revalidateList,
+  radarrData,
+  sonarrData,
+}: RequestItemProps) => {
  const settings = useSettings();
  const { ref, inView } = useInView({
    triggerOnce: true,
@@ -326,16 +335,23 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
  const [isRetrying, setRetrying] = useState(false);

  const modifyRequest = async (type: 'approve' | 'decline') => {
-    const response = await axios.post(`/api/v1/request/${request.id}/${type}`);
+    const res = await fetch(`/api/v1/request/${request.id}/${type}`, {
+      method: 'POST',
+    });
+    if (!res.ok) throw new Error();
+    const data = await res.json();

-    if (response) {
+    if (data) {
      revalidate();
      mutate('/api/v1/request/count');
    }
  };

  const deleteRequest = async () => {
-    await axios.delete(`/api/v1/request/${request.id}`);
+    const res = await fetch(`/api/v1/request/${request.id}`, {
+      method: 'DELETE',
+    });
+    if (!res.ok) throw new Error();

    revalidateList();
    mutate('/api/v1/request/count');
@@ -343,8 +359,13 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {

  const deleteMediaFile = async () => {
    if (request.media) {
-      await axios.delete(`/api/v1/media/${request.media.id}/file`);
-      await axios.delete(`/api/v1/media/${request.media.id}`);
+      // we don't check if the response is ok here because there may be no file to delete
+      await fetch(`/api/v1/media/${request.media.id}/file`, {
+        method: 'DELETE',
+      });
+      await fetch(`/api/v1/media/${request.media.id}`, {
+        method: 'DELETE',
+      });
      revalidateList();
    }
  };
@@ -353,7 +374,12 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
    setRetrying(true);

    try {
-      const result = await axios.post(`/api/v1/request/${request.id}/retry`);
+      const res = await fetch(`/api/v1/request/${request.id}/retry`, {
+        method: 'POST',
+      });
+      if (!res.ok) throw new Error();
+      const result = await res.json();
+
      revalidate(result.data);
    } catch (e) {
      addToast(intl.formatMessage(messages.failedretry), {
@@ -372,6 +398,23 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
    iOSPlexUrl4k: requestData?.media?.iOSPlexUrl4k,
  });

+  const serviceExists = () => {
+    if (title?.mediaInfo) {
+      if (title?.mediaInfo.mediaType === MediaType.MOVIE) {
+        return (
+          radarrData?.find((radarr) => radarr.id === request.serverId) !==
+          undefined
+        );
+      } else {
+        return (
+          sonarrData?.find((sonarr) => sonarr.id === request.serverId) !==
+          undefined
+        );
+      }
+    }
+    return false;
+  };
+
  if (!title && !error) {
    return (
      <div
@@ -679,30 +722,30 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
            )}
          {requestData.status !== MediaRequestStatus.PENDING &&
            hasPermission(Permission.MANAGE_REQUESTS) && (
-              <>
-                <ConfirmButton
-                  onClick={() => deleteRequest()}
-                  confirmText={intl.formatMessage(globalMessages.areyousure)}
-                  className="w-full"
-                >
-                  <TrashIcon />
-                  <span>{intl.formatMessage(messages.deleterequest)}</span>
-                </ConfirmButton>
-                {request.canRemove && (
-                  <ConfirmButton
-                    onClick={() => deleteMediaFile()}
-                    confirmText={intl.formatMessage(globalMessages.areyousure)}
-                    className="w-full"
-                  >
-                    <TrashIcon />
-                    <span>
-                      {intl.formatMessage(messages.removearr, {
-                        arr: request.type === 'movie' ? 'Radarr' : 'Sonarr',
-                      })}
-                    </span>
-                  </ConfirmButton>
-                )}
-              </>
+              <ConfirmButton
+                onClick={() => deleteRequest()}
+                confirmText={intl.formatMessage(globalMessages.areyousure)}
+                className="w-full"
+              >
+                <TrashIcon />
+                <span>{intl.formatMessage(messages.deleterequest)}</span>
+              </ConfirmButton>
+            )}
+          {hasPermission(Permission.MANAGE_REQUESTS) &&
+            title?.mediaInfo?.serviceId &&
+            serviceExists() && (
+              <ConfirmButton
+                onClick={() => deleteMediaFile()}
+                confirmText={intl.formatMessage(globalMessages.areyousure)}
+                className="w-full"
+              >
+                <TrashIcon />
+                <span>
+                  {intl.formatMessage(messages.removearr, {
+                    arr: request.type === 'movie' ? 'Radarr' : 'Sonarr',
+                  })}
+                </span>
+              </ConfirmButton>
            )}
          {requestData.status === MediaRequestStatus.PENDING &&
            hasPermission(Permission.MANAGE_REQUESTS) && (
--- a/src/components/RequestList/index.tsx
+++ b/src/components/RequestList/index.tsx
@@ -17,6 +17,8 @@ import {
  FunnelIcon,
 } from '@heroicons/react/24/solid';
 import type { RequestResultsResponse } from '@server/interfaces/api/requestInterfaces';
+import { Permission } from '@server/lib/permissions';
+import type { RadarrSettings, SonarrSettings } from '@server/lib/settings';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
 import { useEffect, useState } from 'react';
@@ -51,7 +53,7 @@ const RequestList = () => {
  const { user } = useUser({
    id: Number(router.query.userId),
  });
-  const { user: currentUser } = useUser();
+  const { user: currentUser, hasPermission } = useUser();
  const [currentFilter, setCurrentFilter] = useState<Filter>(Filter.PENDING);
  const [currentSort, setCurrentSort] = useState<Sort>('added');
  const [currentSortDirection, setCurrentSortDirection] =
@@ -62,6 +64,13 @@ const RequestList = () => {
  const pageIndex = page - 1;
  const updateQueryParams = useUpdateQueryParams({ page: page.toString() });

+  const { data: radarrData } = useSWR<RadarrSettings[]>(
+    hasPermission(Permission.ADMIN) ? '/api/v1/settings/radarr' : null
+  );
+  const { data: sonarrData } = useSWR<SonarrSettings[]>(
+    hasPermission(Permission.ADMIN) ? '/api/v1/settings/sonarr' : null
+  );
+
  const {
    data,
    error,
@@ -245,6 +254,8 @@ const RequestList = () => {
            <RequestItem
              request={request}
              revalidateList={() => revalidate()}
+              radarrData={radarrData}
+              sonarrData={sonarrData}
            />
          </div>
        );
--- a/src/components/RequestModal/CollectionRequestModal.tsx
+++ b/src/components/RequestModal/CollectionRequestModal.tsx
@@ -13,7 +13,6 @@ import type { MediaRequest } from '@server/entity/MediaRequest';
 import type { QuotaResponse } from '@server/interfaces/api/userInterfaces';
 import { Permission } from '@server/lib/permissions';
 import type { Collection } from '@server/models/Collection';
-import axios from 'axios';
 import { useCallback, useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
@@ -199,12 +198,19 @@ const CollectionRequestModal = ({
        (
          data?.parts.filter((part) => selectedParts.includes(part.id)) ?? []
        ).map(async (part) => {
-          await axios.post<MediaRequest>('/api/v1/request', {
-            mediaId: part.id,
-            mediaType: 'movie',
-            is4k,
-            ...overrideParams,
+          const res = await fetch('/api/v1/request', {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+              mediaId: part.id,
+              mediaType: 'movie',
+              is4k,
+              ...overrideParams,
+            }),
          });
+          if (!res.ok) throw new Error();
        })
      );

--- a/src/components/RequestModal/MovieRequestModal.tsx
+++ b/src/components/RequestModal/MovieRequestModal.tsx
@@ -12,7 +12,6 @@ import type { NonFunctionProperties } from '@server/interfaces/api/common';
 import type { QuotaResponse } from '@server/interfaces/api/userInterfaces';
 import { Permission } from '@server/lib/permissions';
 import type { MovieDetails } from '@server/models/Movie';
-import axios from 'axios';
 import { useCallback, useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
@@ -90,16 +89,24 @@ const MovieRequestModal = ({
          tags: requestOverrides.tags,
        };
      }
-      const response = await axios.post<MediaRequest>('/api/v1/request', {
-        mediaId: data?.id,
-        mediaType: 'movie',
-        is4k,
-        ...overrideParams,
+      const res = await fetch('/api/v1/request', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+          mediaId: data?.id,
+          mediaType: 'movie',
+          is4k,
+          ...overrideParams,
+        }),
      });
+      if (!res.ok) throw new Error();
+      const mediaRequest: MediaRequest = await res.json();
      mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
      mutate('/api/v1/request/count');

-      if (response.data) {
+      if (mediaRequest) {
        if (onComplete) {
          onComplete(
            hasPermission(
@@ -147,13 +154,15 @@ const MovieRequestModal = ({
    setIsUpdating(true);

    try {
-      const response = await axios.delete<MediaRequest>(
-        `/api/v1/request/${editRequest?.id}`
-      );
+      const res = await fetch(`/api/v1/request/${editRequest?.id}`, {
+        method: 'DELETE',
+      });
+      if (!res.ok) throw new Error();
+
      mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
      mutate('/api/v1/request/count');

-      if (response.status === 204) {
+      if (res.status === 204) {
        if (onComplete) {
          onComplete(MediaStatus.UNKNOWN);
        }
@@ -176,17 +185,27 @@ const MovieRequestModal = ({
    setIsUpdating(true);

    try {
-      await axios.put(`/api/v1/request/${editRequest?.id}`, {
-        mediaType: 'movie',
-        serverId: requestOverrides?.server,
-        profileId: requestOverrides?.profile,
-        rootFolder: requestOverrides?.folder,
-        userId: requestOverrides?.user?.id,
-        tags: requestOverrides?.tags,
+      const res = await fetch(`/api/v1/request/${editRequest?.id}`, {
+        method: 'PUT',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+          mediaType: 'movie',
+          serverId: requestOverrides?.server,
+          profileId: requestOverrides?.profile,
+          rootFolder: requestOverrides?.folder,
+          userId: requestOverrides?.user?.id,
+          tags: requestOverrides?.tags,
+        }),
      });
+      if (!res.ok) throw new Error();

      if (alsoApproveRequest) {
-        await axios.post(`/api/v1/request/${editRequest?.id}/approve`);
+        const res = await fetch(`/api/v1/request/${editRequest?.id}/approve`, {
+          method: 'POST',
+        });
+        if (!res.ok) throw new Error();
      }
      mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
      mutate('/api/v1/request/count');
--- a/src/components/RequestModal/TvRequestModal.tsx
+++ b/src/components/RequestModal/TvRequestModal.tsx
@@ -17,7 +17,6 @@ import type { NonFunctionProperties } from '@server/interfaces/api/common';
 import type { QuotaResponse } from '@server/interfaces/api/userInterfaces';
 import { Permission } from '@server/lib/permissions';
 import type { TvDetails } from '@server/models/Tv';
-import axios from 'axios';
 import { useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
@@ -112,22 +111,35 @@ const TvRequestModal = ({

    try {
      if (selectedSeasons.length > 0) {
-        await axios.put(`/api/v1/request/${editRequest.id}`, {
-          mediaType: 'tv',
-          serverId: requestOverrides?.server,
-          profileId: requestOverrides?.profile,
-          rootFolder: requestOverrides?.folder,
-          languageProfileId: requestOverrides?.language,
-          userId: requestOverrides?.user?.id,
-          tags: requestOverrides?.tags,
-          seasons: selectedSeasons,
+        const res = await fetch(`/api/v1/request/${editRequest.id}`, {
+          method: 'PUT',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify({
+            mediaType: 'tv',
+            serverId: requestOverrides?.server,
+            profileId: requestOverrides?.profile,
+            rootFolder: requestOverrides?.folder,
+            languageProfileId: requestOverrides?.language,
+            userId: requestOverrides?.user?.id,
+            tags: requestOverrides?.tags,
+            seasons: selectedSeasons,
+          }),
        });
+        if (!res.ok) throw new Error();

        if (alsoApproveRequest) {
-          await axios.post(`/api/v1/request/${editRequest.id}/approve`);
+          const res = await fetch(`/api/v1/request/${editRequest.id}/approve`, {
+            method: 'POST',
+          });
+          if (!res.ok) throw new Error();
        }
      } else {
-        await axios.delete(`/api/v1/request/${editRequest.id}`);
+        const res = await fetch(`/api/v1/request/${editRequest.id}`, {
+          method: 'DELETE',
+        });
+        if (!res.ok) throw new Error();
      }
      mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');
      mutate('/api/v1/request/count');
@@ -194,23 +206,32 @@ const TvRequestModal = ({
          tags: requestOverrides.tags,
        };
      }
-      const response = await axios.post<MediaRequest>('/api/v1/request', {
-        mediaId: data?.id,
-        tvdbId: tvdbId ?? data?.externalIds.tvdbId,
-        mediaType: 'tv',
-        is4k,
-        seasons: settings.currentSettings.partialRequestsEnabled
-          ? selectedSeasons.sort((a, b) => a - b)
-          : getAllSeasons().filter(
-              (season) => !getAllRequestedSeasons().includes(season)
-            ),
-        ...overrideParams,
+      const res = await fetch('/api/v1/request', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+          mediaId: data?.id,
+          tvdbId: tvdbId ?? data?.externalIds.tvdbId,
+          mediaType: 'tv',
+          is4k,
+          seasons: settings.currentSettings.partialRequestsEnabled
+            ? selectedSeasons
+            : getAllSeasons().filter(
+                (season) => !getAllRequestedSeasons().includes(season)
+              ),
+          ...overrideParams,
+        }),
      });
+      if (!res.ok) throw new Error();
+      const mediaRequest: MediaRequest = await res.json();
+
      mutate('/api/v1/request?filter=all&take=10&sort=modified&skip=0');

-      if (response.data) {
+      if (mediaRequest) {
        if (onComplete) {
-          onComplete(response.data.media.status);
+          onComplete(mediaRequest.media.status);
        }
        addToast(
          <span>
--- a/src/components/ResetPassword/RequestResetLink.tsx
+++ b/src/components/ResetPassword/RequestResetLink.tsx
@@ -4,7 +4,6 @@ import PageTitle from '@app/components/Common/PageTitle';
 import LanguagePicker from '@app/components/Layout/LanguagePicker';
 import defineMessages from '@app/utils/defineMessages';
 import { ArrowLeftIcon, EnvelopeIcon } from '@heroicons/react/24/solid';
-import axios from 'axios';
 import { Field, Form, Formik } from 'formik';
 import Image from 'next/image';
 import Link from 'next/link';
@@ -85,14 +84,18 @@ const ResetPassword = () => {
                }}
                validationSchema={ResetSchema}
                onSubmit={async (values) => {
-                  const response = await axios.post(
-                    `/api/v1/auth/reset-password`,
-                    {
+                  const res = await fetch(`/api/v1/auth/reset-password`, {
+                    method: 'POST',
+                    headers: {
+                      'Content-Type': 'application/json',
+                    },
+                    body: JSON.stringify({
                      email: values.email,
-                    }
-                  );
+                    }),
+                  });
+                  if (!res.ok) throw new Error();

-                  if (response.status === 200) {
+                  if (res.status === 200) {
                    setSubmitted(true);
                  }
                }}
--- a/src/components/ResetPassword/index.tsx
+++ b/src/components/ResetPassword/index.tsx
@@ -5,7 +5,6 @@ import LanguagePicker from '@app/components/Layout/LanguagePicker';
 import globalMessages from '@app/i18n/globalMessages';
 import defineMessages from '@app/utils/defineMessages';
 import { LifebuoyIcon } from '@heroicons/react/24/outline';
-import axios from 'axios';
 import { Form, Formik } from 'formik';
 import Image from 'next/image';
 import Link from 'next/link';
@@ -100,14 +99,21 @@ const ResetPassword = () => {
                }}
                validationSchema={ResetSchema}
                onSubmit={async (values) => {
-                  const response = await axios.post(
+                  const res = await fetch(
                    `/api/v1/auth/reset-password/${guid}`,
                    {
-                      password: values.password,
+                      method: 'POST',
+                      headers: {
+                        'Content-Type': 'application/json',
+                      },
+                      body: JSON.stringify({
+                        password: values.password,
+                      }),
                    }
                  );
+                  if (!res.ok) throw new Error();

-                  if (response.status === 200) {
+                  if (res.status === 200) {
                    setSubmitted(true);
                  }
                }}
--- a/src/components/Selector/index.tsx
+++ b/src/components/Selector/index.tsx
@@ -19,7 +19,6 @@ import type {
  ProductionCompany,
  WatchProviderDetails,
 } from '@server/models/common';
-import axios from 'axios';
 import { orderBy } from 'lodash';
 import { useEffect, useMemo, useState } from 'react';
 import { useIntl } from 'react-intl';
@@ -81,11 +80,9 @@ export const CompanySelector = ({
        return;
      }

-      const response = await axios.get<ProductionCompany>(
-        `/api/v1/studio/${defaultValue}`
-      );
-
-      const studio = response.data;
+      const res = await fetch(`/api/v1/studio/${defaultValue}`);
+      if (!res.ok) throw new Error();
+      const studio: ProductionCompany = await res.json();

      setDefaultDataValue([
        {
@@ -103,16 +100,15 @@ export const CompanySelector = ({
      return [];
    }

-    const results = await axios.get<TmdbCompanySearchResponse>(
-      '/api/v1/search/company',
-      {
-        params: {
-          query: encodeURIExtraParams(inputValue),
-        },
-      }
+    const res = await fetch(
+      `/api/v1/search/company?query=${encodeURIExtraParams(inputValue)}`
    );
+    if (!res.ok) {
+      throw new Error('Network response was not ok');
+    }
+    const results: TmdbCompanySearchResponse = await res.json();

-    return results.data.results.map((result) => ({
+    return results.results.map((result) => ({
      label: result.name,
      value: result.id,
    }));
@@ -168,11 +164,15 @@ export const GenreSelector = ({

      const genres = defaultValue.split(',');

-      const response = await axios.get<TmdbGenre[]>(`/api/v1/genres/${type}`);
+      const res = await fetch(`/api/v1/genres/${type}`);
+      if (!res.ok) {
+        throw new Error('Network response was not ok');
+      }
+      const response: TmdbGenre[] = await res.json();

      const genreData = genres
-        .filter((genre) => response.data.find((gd) => gd.id === Number(genre)))
-        .map((g) => response.data.find((gd) => gd.id === Number(g)))
+        .filter((genre) => response.find((gd) => gd.id === Number(genre)))
+        .map((g) => response.find((gd) => gd.id === Number(g)))
        .map((g) => ({
          label: g?.name ?? '',
          value: g?.id ?? 0,
@@ -185,11 +185,11 @@ export const GenreSelector = ({
  }, [defaultValue, type]);

  const loadGenreOptions = async (inputValue: string) => {
-    const results = await axios.get<GenreSliderItem[]>(
-      `/api/v1/discover/genreslider/${type}`
-    );
+    const res = await fetch(`/api/v1/discover/genreslider/${type}`);
+    if (!res.ok) throw new Error();
+    const results: GenreSliderItem[] = await res.json();

-    return results.data
+    return results
      .map((result) => ({
        label: result.name,
        value: result.id,
@@ -309,11 +309,13 @@ export const KeywordSelector = ({

      const keywords = await Promise.all(
        defaultValue.split(',').map(async (keywordId) => {
-          const keyword = await axios.get<Keyword>(
-            `/api/v1/keyword/${keywordId}`
-          );
+          const res = await fetch(`/api/v1/keyword/${keywordId}`);
+          if (!res.ok) {
+            throw new Error('Network response was not ok');
+          }
+          const keyword: Keyword = await res.json();

-          return keyword.data;
+          return keyword;
        })
      );

@@ -329,16 +331,15 @@ export const KeywordSelector = ({
  }, [defaultValue]);

  const loadKeywordOptions = async (inputValue: string) => {
-    const results = await axios.get<TmdbKeywordSearchResponse>(
-      '/api/v1/search/keyword',
-      {
-        params: {
-          query: encodeURIExtraParams(inputValue),
-        },
-      }
+    const res = await fetch(
+      `/api/v1/search/keyword?query=${encodeURIExtraParams(inputValue)}`
    );
+    if (!res.ok) {
+      throw new Error('Network response was not ok');
+    }
+    const results: TmdbKeywordSearchResponse = await res.json();

-    return results.data.results.map((result) => ({
+    return results.results.map((result) => ({
      label: result.name,
      value: result.id,
    }));
@@ -577,10 +578,14 @@ export const UserSelector = ({

      const users = defaultValue.split(',');

-      const res = await axios.get(
+      const res = await fetch(
        `/api/v1/user?includeIds=${encodeURIComponent(defaultValue)}`
      );
-      const response: UserResultsResponse = res.data;
+
+      if (!res.ok) {
+        throw new Error('Network response was not ok');
+      }
+      const response: UserResultsResponse = await res.json();

      const genreData = users
        .filter((u) => response.results.find((user) => user.id === Number(u)))
@@ -597,10 +602,11 @@ export const UserSelector = ({
  }, [defaultValue]);

  const loadUserOptions = async (inputValue: string) => {
-    const res = await axios.get(
+    const res = await fetch(
      `/api/v1/user${inputValue ? `?q=${encodeURIComponent(inputValue)}` : ''}`
    );
-    const results: UserResultsResponse = res.data;
+    if (!res.ok) throw new Error();
+    const results: UserResultsResponse = await res.json();

    return results.results
      .map((result) => ({
--- a/src/components/ServiceWorkerSetup/index.tsx
+++ b/src/components/ServiceWorkerSetup/index.tsx
@@ -1,9 +1,10 @@
 /* eslint-disable no-console */
-
+import useSettings from '@app/hooks/useSettings';
 import { useUser } from '@app/hooks/useUser';
 import { useEffect } from 'react';

 const ServiceWorkerSetup = () => {
+  const { currentSettings } = useSettings();
  const { user } = useUser();
  useEffect(() => {
    if ('serviceWorker' in navigator && user?.id) {
@@ -14,12 +15,40 @@ const ServiceWorkerSetup = () => {
            '[SW] Registration successful, scope is:',
            registration.scope
          );
+
+          if (currentSettings.enablePushRegistration) {
+            const sub = await registration.pushManager.subscribe({
+              userVisibleOnly: true,
+              applicationServerKey: currentSettings.vapidPublic,
+            });
+
+            const parsedSub = JSON.parse(JSON.stringify(sub));
+
+            if (parsedSub.keys.p256dh && parsedSub.keys.auth) {
+              const res = await fetch('/api/v1/user/registerPushSubscription', {
+                method: 'POST',
+                headers: {
+                  'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({
+                  endpoint: parsedSub.endpoint,
+                  p256dh: parsedSub.keys.p256dh,
+                  auth: parsedSub.keys.auth,
+                }),
+              });
+              if (!res.ok) throw new Error();
+            }
+          }
        })
        .catch(function (error) {
          console.log('[SW] Service worker registration failed, error:', error);
        });
    }
-  }, [user]);
+  }, [
+    user,
+    currentSettings.vapidPublic,
+    currentSettings.enablePushRegistration,
+  ]);
  return null;
 };

--- a/src/components/Settings/CopyButton.tsx
+++ b/src/components/Settings/CopyButton.tsx
@@ -1,54 +1,40 @@
-import Tooltip from '@app/components/Common/Tooltip';
+import defineMessages from '@app/utils/defineMessages';
 import { ClipboardDocumentIcon } from '@heroicons/react/24/solid';
-import React, { useEffect } from 'react';
-import type { Config } from 'react-popper-tooltip';
+import { useEffect } from 'react';
+import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import useClipboard from 'react-use-clipboard';

-type CopyButtonProps = {
-  textToCopy: string;
-  disabled?: boolean;
-  toastMessage?: string;
+const messages = defineMessages('components.Settings', {
+  copied: 'Copied API key to clipboard.',
+});

-  tooltipContent?: React.ReactNode;
-  tooltipConfig?: Partial<Config>;
-};
-
-const CopyButton = ({
-  textToCopy,
-  disabled,
-  toastMessage,
-  tooltipContent,
-  tooltipConfig,
-}: CopyButtonProps) => {
+const CopyButton = ({ textToCopy }: { textToCopy: string }) => {
+  const intl = useIntl();
  const [isCopied, setCopied] = useClipboard(textToCopy, {
    successDuration: 1000,
  });
  const { addToast } = useToasts();

  useEffect(() => {
-    if (isCopied && toastMessage) {
-      addToast(toastMessage, {
+    if (isCopied) {
+      addToast(intl.formatMessage(messages.copied), {
        appearance: 'info',
        autoDismiss: true,
      });
    }
-  }, [isCopied, addToast, toastMessage]);
+  }, [isCopied, addToast, intl]);

  return (
-    <Tooltip content={tooltipContent} tooltipConfig={tooltipConfig}>
-      <button
-        onClick={(e) => {
-          e.preventDefault();
-          setCopied();
-        }}
-        className="input-action"
-        type="button"
-        disabled={disabled}
-      >
-        <ClipboardDocumentIcon />
-      </button>
-    </Tooltip>
+    <button
+      onClick={(e) => {
+        e.preventDefault();
+        setCopied();
+      }}
+      className="input-action"
+    >
+      <ClipboardDocumentIcon />
+    </button>
  );
 };

--- a/Show More
+++ b/Show More