diff --git a/server/config.js b/server/config.js
index 60d3705c..872d946f 100644
--- a/server/config.js
+++ b/server/config.js
@@ -169,14 +169,14 @@ const conf = convict({
     env: 'BASE_URL'
   },
   custom_title: {
-	format: String,
-	default: 'Send',
-	env: 'CUSTOM_TITLE'
+    format: String,
+    default: 'Send',
+    env: 'CUSTOM_TITLE'
   },
   custom_description: {
-	format: String,
-	default: 'Encrypt and send files with a link that automatically expires to ensure your important documents don’t stay online forever.',
-	env: 'CUSTOM_DESCRIPTION'
+    format: String,
+    default: 'Encrypt and send files with a link that automatically expires to ensure your important documents don’t stay online forever.',
+    env: 'CUSTOM_DESCRIPTION'
   },
   detect_base_url: {
     format: Boolean,
@@ -329,11 +329,11 @@ const conf = convict({
       default: '',
       env: 'UI_CUSTOM_ASSETS_WORDMARK'
     },
-	custom_css: {
-	  format: String,
-	  default: '',
-	  env: 'UI_CUSTOM_CSS'
-	}
+    custom_css: {
+      format: String,
+      default: '',
+      env: 'UI_CUSTOM_CSS'
+    }
   }
 });
 
diff --git a/server/layout.js b/server/layout.js
index 0aceade7..6d2051ab 100644
--- a/server/layout.js
+++ b/server/layout.js
@@ -3,6 +3,10 @@ const assets = require('../common/assets');
 const initScript = require('./initScript');
 
 module.exports = function(state, body = '') {
+  const custom_css = state.ui.assets.custom_css !== ''
+    ? html`<link rel="stylesheet" type="text/css" href="${state.ui.assets.custom_css}" />`
+    : ''
+
   return html`
     <!DOCTYPE html>
     <html lang="${state.locale}">
@@ -40,16 +44,7 @@ module.exports = function(state, body = '') {
           type="text/css"
           href="${assets.get('app.css')}"
         />
-        <script>
-        var custom_css_file = '${state.ui.assets.custom_css}';
-          if (custom_css_file!="undefined") {
-            var custom_css_enabled = document.createElement('link');
-            custom_css_enabled.rel = 'stylesheet';
-            custom_css_enabled.type = 'text/css';
-            custom_css_enabled.href = '${state.ui.assets.custom_css}';
-            document.head.appendChild(custom_css_enabled);
-          }
-        </script>
+        ${custom_css}
         <link
           rel="apple-touch-icon"
           sizes="180x180"