diff --git a/bs_base.theme b/bs_base.theme
index 78ea1ef..5004414 100644
--- a/bs_base.theme
+++ b/bs_base.theme
@@ -92,5 +92,7 @@ function bs_base_preprocess_page(&$variables) {
 function bs_base_preprocess_maintenance_page(&$variables) {
   // Add maintenance image path.
   $maintenance_image = theme_get_setting('bs_base.maintenance_image');
-  $variables['maintenance_image_path'] = file_url_transform_relative(file_create_url($maintenance_image['path']));
+  if (!empty($maintenance_image['path'])) {
+    $variables['maintenance_image_path'] = file_url_transform_relative(file_create_url($maintenance_image['path']));
+  }
 }
diff --git a/themes/bs_bootstrap/sass/layout/partials/_maintenance-page.scss b/themes/bs_bootstrap/sass/layout/partials/_maintenance-page.scss
index e4bde06..c6671aa 100644
--- a/themes/bs_bootstrap/sass/layout/partials/_maintenance-page.scss
+++ b/themes/bs_bootstrap/sass/layout/partials/_maintenance-page.scss
@@ -1,13 +1,13 @@
-.maintenance {
+.maintenance--image {
   @include media-responsive-breakpoint-up() {
-    &-text {
+    .maintenance__text {
       flex-basis: 60%;
       max-width: 60%;
       display: flex;
       align-items: center;
     }
 
-    &-image {
+    .maintenance__image {
       flex-basis: 40%;
       max-width: 40%;
     }
diff --git a/themes/bs_bootstrap/templates/layout/maintenance-page.html.twig b/themes/bs_bootstrap/templates/layout/maintenance-page.html.twig
index 16280c5..45f8779 100644
--- a/themes/bs_bootstrap/templates/layout/maintenance-page.html.twig
+++ b/themes/bs_bootstrap/templates/layout/maintenance-page.html.twig
@@ -43,16 +43,18 @@
     {% if title -%}
       <h1>{{ title }}</h1>
     {%- endif %}
-    <div class="row">
-      <div class="maintenance-text col">
+    <div class="row {{ maintenance_image_path ? 'maintenance--image'}}">
+      <div class="maintenance__text col">
         {{ page.highlighted }}
         <p>
           {{ page.content }}
         </p>
       </div>
-      <div class="maintenance-image col">
-        <img src="{{ maintenance_image_path }}" title="{{ 'Site maintenance image'|t }}" />
-      </div>
+      {% if maintenance_image_path -%}
+        <div class="maintenance__image col">
+          <img src="{{ maintenance_image_path }}" title="{{ 'Site maintenance image'|t }}" />
+        </div>
+      {%- endif %}
     </div>
   </div>
 {%- endblock %}