diff --git a/resources/views/layouts/basic.blade.php b/resources/views/layouts/basic.blade.php
index 3ea432d3ef..699446b330 100644
--- a/resources/views/layouts/basic.blade.php
+++ b/resources/views/layouts/basic.blade.php
@@ -33,13 +33,16 @@
         border-color: {{ $snipeSettings->header_color }};
         }
 
-        @if ($snipeSettings->custom_css)
-            {{ $snipeSettings->show_custom_css() }}
-        @endif
         </style>
 
     @endif
 
+    @if (($snipeSettings) && ($snipeSettings->custom_css))
+        <style>
+            {!! $snipeSettings->show_custom_css() !!}
+        </style>
+    @endif
+
 </head>
 
 <body class="hold-transition login-page">
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 78adec2d8b..196b085bbc 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -54,9 +54,7 @@
         }
         @endif
 
-        @if (($snipeSettings) && ($snipeSettings->custom_css!=''))
-            {!! $snipeSettings->show_custom_css() !!}
-        @endif
+
 
     @media (max-width: 400px) {
       .navbar-left {
@@ -69,6 +67,12 @@
     }
     </style>
 
+      @if (($snipeSettings) && ($snipeSettings->custom_css))
+          <style>
+              {!! $snipeSettings->show_custom_css() !!}
+          </style>
+      @endif
+
     <script nonce="{{ csrf_token() }}">
           window.snipeit = {
               settings: {
