diff --git a/site/themes/default/views/partials/head.php b/site/themes/default/views/partials/head.php
index f29ca669..31c408a1 100755
--- a/site/themes/default/views/partials/head.php
+++ b/site/themes/default/views/partials/head.php
@@ -18,12 +18,14 @@
 
     <?php Assets::add('css', Http::getBaseUrl() . '/site/themes/' . Registry::get('settings.theme') . '/assets/dist/css/bootstrap.min.css', 'site', 1) ?>
     <?php Assets::add('css', Http::getBaseUrl() . '/site/themes/' . Registry::get('settings.theme') . '/assets/dist/css/default.min.css', 'site', 2) ?>
-    <?php foreach (Assets::get('css', 'site') as $assets_by_priorities): ?>
-        <?php foreach ($assets_by_priorities as $assets): ?>
-            <link href="<?= $assets['asset'] ?>" rel="stylesheet">
+    <?php $assets_site = Assets::get('css', 'site') ?>
+    <?php if (count($assets_site) > 0): ?>
+        <?php foreach ($assets_site as $assets_by_priorities): ?>
+            <?php foreach ($assets_by_priorities as $assets): ?>
+                <link href="<?= $assets['asset'] ?>" rel="stylesheet">
+            <?php endforeach ?>
         <?php endforeach ?>
-    <?php endforeach ?>
-
+    <?php endif ?>
     <?php Event::dispatch('onThemeHeader') ?>
   </head>
   <body>
diff --git a/site/themes/default/views/partials/tail.php b/site/themes/default/views/partials/tail.php
index c1e9ccc3..f143e3fe 100755
--- a/site/themes/default/views/partials/tail.php
+++ b/site/themes/default/views/partials/tail.php
@@ -1,9 +1,12 @@
 <?php namespace Flextype ?>
 <?php use Flextype\Component\{Event\Event, Http\Http, Registry\Registry, Assets\Assets} ?>
 <?php Assets::add('js', Http::getBaseUrl() . '/site/themes/' . Registry::get('settings.theme') . '/assets/dist/js/default.min.js', 'site', 1) ?>
-<?php foreach (Assets::get('js', 'site') as $assets_by_priorities): ?>
-    <?php foreach ($assets_by_priorities as $assets): ?>
-        <script src="<?= $assets['asset'] ?>"></script>
+<?php $assets_site = Assets::get('js', 'site') ?>
+<?php if (count($assets_site) > 0): ?>
+    <?php foreach ($assets_site as $assets_by_priorities): ?>
+        <?php foreach ($assets_by_priorities as $assets): ?>
+            <script src="<?= $assets['asset'] ?>"></script>
+        <?php endforeach ?>
     <?php endforeach ?>
-<?php endforeach ?>
+<?php endif ?>
 <?php Event::dispatch('onThemeFooter') ?>
