diff --git a/src/components/displaySettings/displaySettings.js b/src/components/displaySettings/displaySettings.js
index 92e071003..c51e2a84d 100644
--- a/src/components/displaySettings/displaySettings.js
+++ b/src/components/displaySettings/displaySettings.js
@@ -11,6 +11,7 @@ import { Events } from 'jellyfin-apiclient';
 import '../../elements/emby-select/emby-select';
 import '../../elements/emby-checkbox/emby-checkbox';
 import '../../elements/emby-button/emby-button';
+import '../../elements/emby-textarea/emby-textarea';
 import ServerConnections from '../ServerConnections';
 import toast from '../toast/toast';
 import template from './displaySettings.template.html';
@@ -124,6 +125,9 @@ import template from './displaySettings.template.html';
         context.querySelector('#chkDetailsBanner').checked = userSettings.detailsBanner();
         context.querySelector('#chkUseEpisodeImagesInNextUp').checked = userSettings.useEpisodeImagesInNextUpAndResume();
 
+        context.querySelector('#chkDisableCustomCss').checked = userSettings.disableCustomCss();
+        context.querySelector('#txtLocalCustomCss').value = userSettings.customCss();
+
         context.querySelector('#selectLanguage').value = userSettings.language() || '';
         context.querySelector('.selectDateTimeLocale').value = userSettings.dateTimeLocale() || '';
 
@@ -159,6 +163,9 @@ import template from './displaySettings.template.html';
         userSettingsInstance.detailsBanner(context.querySelector('#chkDetailsBanner').checked);
         userSettingsInstance.useEpisodeImagesInNextUpAndResume(context.querySelector('#chkUseEpisodeImagesInNextUp').checked);
 
+        userSettingsInstance.disableCustomCss(context.querySelector('#chkDisableCustomCss').checked);
+        userSettingsInstance.customCss(context.querySelector('#txtLocalCustomCss').value);
+
         if (user.Id === apiClient.getCurrentUserId()) {
             skinManager.setTheme(userSettingsInstance.theme());
         }
diff --git a/src/components/displaySettings/displaySettings.template.html b/src/components/displaySettings/displaySettings.template.html
index 35880b90a..4fcaf4650 100644
--- a/src/components/displaySettings/displaySettings.template.html
+++ b/src/components/displaySettings/displaySettings.template.html
@@ -156,6 +156,19 @@
         <select id="selectTheme" is="emby-select" label="${LabelTheme}"></select>
     </div>
 
+    <div class="checkboxContainer checkboxContainer-withDescription">
+        <label>
+            <input type="checkbox" is="emby-checkbox" id="chkDisableCustomCss" />
+            <span>${DisableCustomCss}</span>
+        </label>
+        <div class="fieldDescription checkboxFieldDescription">${LabelDisableCustomCss}</div>
+    </div>
+
+    <div class="inputContainer customCssContainer">
+        <textarea is="emby-textarea" id="txtLocalCustomCss" label="${LabelCustomCss}" class="textarea-mono"></textarea>
+        <div class="fieldDescription">${LabelLocalCustomCss}</div>
+    </div>
+
     <div class="selectContainer selectDashboardThemeContainer hide">
         <select id="selectDashboardTheme" is="emby-select" label="${LabelDashboardTheme}"></select>
     </div>
diff --git a/src/elements/emby-textarea/emby-textarea.js b/src/elements/emby-textarea/emby-textarea.js
index 5a34c2e8b..309164ddd 100644
--- a/src/elements/emby-textarea/emby-textarea.js
+++ b/src/elements/emby-textarea/emby-textarea.js
@@ -56,7 +56,6 @@ import '../emby-input/emby-input';
                 textarea.style.height = 'auto';
                 newHeight = textarea.scrollHeight/* - offset*/;
             }
-            $('.customCssContainer').css('height', newHeight + 'px');
             textarea.style.height = newHeight + 'px';
         }
 
diff --git a/src/scripts/settings/userSettings.js b/src/scripts/settings/userSettings.js
index 96b2d5e7c..f5c3786d2 100644
--- a/src/scripts/settings/userSettings.js
+++ b/src/scripts/settings/userSettings.js
@@ -239,6 +239,32 @@ export class UserSettings {
         return val === 'true';
     }
 
+    /**
+     * Get or set 'disableCustomCss' state.
+     * @param {boolean|undefined} val - Flag to enable 'disableCustomCss' or undefined.
+     * @return {boolean} 'disableCustomCss' state.
+     */
+    disableCustomCss(val) {
+        if (val !== undefined) {
+            return this.set('disableCustomCss', val.toString(), false);
+        }
+
+        return this.get('disableCustomCss', false) === 'true';
+    }
+
+    /**
+     * Get or set customCss.
+     * @param {string|undefined} val - Language.
+     * @return {string} Language.
+     */
+    customCss(val) {
+        if (val !== undefined) {
+            return this.set('customCss', val.toString(), false);
+        }
+
+        return this.get('customCss', false);
+    }
+
     /**
      * Get or set 'Details Banner' state.
      * @param {boolean|undefined} val - Flag to enable 'Details Banner' or undefined.
@@ -526,3 +552,5 @@ export const getSubtitleAppearanceSettings = currentSettings.getSubtitleAppearan
 export const setSubtitleAppearanceSettings = currentSettings.setSubtitleAppearanceSettings.bind(currentSettings);
 export const setFilter = currentSettings.setFilter.bind(currentSettings);
 export const getFilter = currentSettings.getFilter.bind(currentSettings);
+export const customCss = currentSettings.customCss.bind(currentSettings);
+export const disableCustomCss = currentSettings.disableCustomCss.bind(currentSettings);
diff --git a/src/scripts/site.js b/src/scripts/site.js
index 2b8e110d3..c1073fc63 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -36,6 +36,7 @@ import { playbackManager } from '../components/playback/playbackmanager';
 import SyncPlayNoActivePlayer from '../components/syncPlay/ui/players/NoActivePlayer';
 import SyncPlayHtmlVideoPlayer from '../components/syncPlay/ui/players/HtmlVideoPlayer';
 import SyncPlayHtmlAudioPlayer from '../components/syncPlay/ui/players/HtmlAudioPlayer';
+import { currentSettings } from './settings/userSettings';
 
 // TODO: Move this elsewhere
 window.getWindowLocationSearch = function(win) {
@@ -173,7 +174,7 @@ function initSyncPlay() {
     Events.on(ServerConnections, 'apiclientcreated', (e, newApiClient) => SyncPlay.Manager.init(newApiClient));
 }
 
-function onAppReady() {
+async function onAppReady() {
     console.debug('begin onAppReady');
 
     console.debug('onAppReady: loading dependencies');
@@ -216,27 +217,63 @@ function onAppReady() {
 
     const apiClient = ServerConnections.currentApiClient();
     if (apiClient) {
-        fetch(apiClient.getUrl('Branding/Css'))
+        const updateStyle = (css) => {
+            let style = document.querySelector('#cssBranding');
+            if (!style) {
+                // Inject the branding css as a dom element in body so it will take
+                // precedence over other stylesheets
+                style = document.createElement('style');
+                style.id = 'cssBranding';
+                document.body.appendChild(style);
+            }
+            style.textContent = css;
+        };
+
+        const style = fetch(apiClient.getUrl('Branding/Css'))
             .then(function(response) {
                 if (!response.ok) {
                     throw new Error(response.status + ' ' + response.statusText);
                 }
                 return response.text();
             })
-            .then(function(css) {
-                let style = document.querySelector('#cssBranding');
-                if (!style) {
-                    // Inject the branding css as a dom element in body so it will take
-                    // precedence over other stylesheets
-                    style = document.createElement('style');
-                    style.id = 'cssBranding';
-                    document.body.appendChild(style);
-                }
-                style.textContent = css;
-            })
             .catch(function(err) {
                 console.warn('Error applying custom css', err);
             });
+
+        const handleStyleChange = async () => {
+            if (currentSettings.disableCustomCss()) {
+                updateStyle('');
+            } else {
+                updateStyle(await style);
+            }
+
+            const localCss = currentSettings.customCss();
+            let localStyle = document.querySelector('#localCssBranding');
+            if (localCss) {
+                if (!localStyle) {
+                    // Inject the branding css as a dom element in body so it will take
+                    // precedence over other stylesheets
+                    localStyle = document.createElement('style');
+                    localStyle.id = 'localCssBranding';
+                    document.body.appendChild(localStyle);
+                }
+                localStyle.textContent = localCss;
+            } else {
+                if (localStyle) {
+                    localStyle.textContent = '';
+                }
+            }
+        };
+
+        Events.on(ServerConnections, 'localusersignedin', handleStyleChange);
+        Events.on(ServerConnections, 'localusersignedout', handleStyleChange);
+        Events.on(currentSettings, 'change', (e, prop) => {
+            if (prop == 'disableCustomCss' || prop == 'customCss') {
+                handleStyleChange();
+            }
+        });
+
+        style.then(updateStyle);
     }
 }
 
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index e99165a69..cd9a62384 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -181,6 +181,7 @@
     "DirectStreamHelp2": "Power consumed by direct streaming usually depends on the audio profile. Only the video stream is lossless.",
     "DirectStreaming": "Direct streaming",
     "EnablePlugin": "Enable",
+    "DisableCustomCss": "Disable Server-Provided Custom CSS",
     "DisablePlugin": "Disable",
     "Disc": "Disc",
     "Disconnect": "Disconnect",
@@ -578,6 +579,7 @@
     "LabelDeinterlaceMethod": "Deinterlacing method:",
     "LabelDeviceDescription": "Device description",
     "LabelDidlMode": "DIDL mode:",
+    "LabelDisableCustomCss": "Disable custom CSS theming/branding provided from the server.",
     "LabelDiscNumber": "Disc number:",
     "LabelDisplayLanguage": "Display language:",
     "LabelDisplayLanguageHelp": "Translating Jellyfin is an ongoing project.",
@@ -679,6 +681,7 @@
     "LabelLibraryPageSize": "Library page size:",
     "LabelLibraryPageSizeHelp": "Sets the amount of items to show on a library page. Set to 0 in order to disable paging.",
     "LabelLineup": "Lineup:",
+    "LabelLocalCustomCss": "Custom CSS styling which applies to this client only. You may want to disable server custom CSS.",
     "LabelLocalHttpServerPortNumber": "Local HTTP port number:",
     "LabelLocalHttpServerPortNumberHelp": "The TCP port number for the HTTP server.",
     "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",