diff --git a/app/views/admin/site_customization/content_blocks/_form.html.erb b/app/views/admin/site_customization/content_blocks/_form.html.erb
index ae9d684d4..ca89b8781 100644
--- a/app/views/admin/site_customization/content_blocks/_form.html.erb
+++ b/app/views/admin/site_customization/content_blocks/_form.html.erb
@@ -34,15 +34,3 @@
   </div>
 
 <% end %>
-
-<h3><%= t('.content_blocks_information') %></h3>
-
-<p><%= t('.content_block_about') %></p>
-
-<p><%= t('.content_block_top_links_html') %></p>
-
-<code>&lt;li&gt;&lt;a href=&quot;http://site1.com&quot;&gt;Site 1&lt;/a&gt;&lt;/li&gt;</code><br>
-<code>&lt;li&gt;&lt;a href=&quot;http://site2.com&quot;&gt;Site 2&lt;/a&gt;&lt;/li&gt;</code><br>
-<code>&lt;li&gt;&lt;a href=&quot;http://site3.com&quot;&gt;Site 3&lt;/a&gt;&lt;/li&gt;</code><br>
-
-<p class="margin-top"><%= t('.content_block_footer_html') %></p>
diff --git a/app/views/admin/site_customization/content_blocks/index.html.erb b/app/views/admin/site_customization/content_blocks/index.html.erb
index 455ac634f..fc762c1fd 100644
--- a/app/views/admin/site_customization/content_blocks/index.html.erb
+++ b/app/views/admin/site_customization/content_blocks/index.html.erb
@@ -6,25 +6,42 @@
 
 <h2 class="inline-block"><%= t("admin.site_customization.content_blocks.index.title") %></h2>
 
-<table class="cms-page-list">
-  <thead>
-    <tr>
-      <th><%= t("admin.site_customization.content_blocks.content_block.name") %></th>
-      <th><%= t("admin.site_customization.content_blocks.content_block.body") %></th>
-      <th><%= t("admin.actions.actions") %></th>
-    </tr>
-  </thead>
-  <tbody>
-  <% @content_blocks.each do |content_block| %>
-    <tr id="<%= dom_id(content_block) %>">
-      <td><%= link_to "#{content_block.name} (#{content_block.locale})", edit_admin_site_customization_content_block_path(content_block) %></td>
-      <td><%= content_block.body.html_safe %></td>
-      <td>
-        <%= button_to t("admin.site_customization.content_blocks.index.delete"),
-                      admin_site_customization_content_block_path(content_block),
-                      method: :delete, class: "button hollow alert" %>
-      </td>
-    </tr>
-  <% end %>
-  </tbody>
-</table>
+<h3><%= t("admin.site_customization.content_blocks.information") %></h3>
+
+<p><%= t("admin.site_customization.content_blocks.about") %></p>
+<p><%= t("admin.site_customization.content_blocks.top_links_html") %></p>
+
+<code>&lt;li&gt;&lt;a href=&quot;http://site1.com&quot;&gt;Site 1&lt;/a&gt;&lt;/li&gt;</code><br>
+<code>&lt;li&gt;&lt;a href=&quot;http://site2.com&quot;&gt;Site 2&lt;/a&gt;&lt;/li&gt;</code><br>
+<code>&lt;li&gt;&lt;a href=&quot;http://site3.com&quot;&gt;Site 3&lt;/a&gt;&lt;/li&gt;</code><br>
+
+<p class="margin-top"><%= t("admin.site_customization.content_blocks.footer_html") %></p>
+
+<% if @content_blocks.any? %>
+  <table class="cms-page-list">
+    <thead>
+      <tr>
+        <th><%= t("admin.site_customization.content_blocks.content_block.name") %></th>
+        <th><%= t("admin.site_customization.content_blocks.content_block.body") %></th>
+        <th><%= t("admin.actions.actions") %></th>
+      </tr>
+    </thead>
+    <tbody>
+    <% @content_blocks.each do |content_block| %>
+      <tr id="<%= dom_id(content_block) %>">
+        <td><%= link_to "#{content_block.name} (#{content_block.locale})", edit_admin_site_customization_content_block_path(content_block) %></td>
+        <td><%= content_block.body.html_safe %></td>
+        <td>
+          <%= button_to t("admin.site_customization.content_blocks.index.delete"),
+                        admin_site_customization_content_block_path(content_block),
+                        method: :delete, class: "button hollow alert" %>
+        </td>
+      </tr>
+    <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="callout primary">
+    <%= t("admin.site_customization.content_blocks.no_blocks") %>
+  </div>
+<% end %>
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index 980a894a3..7c8ad7b59 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -1156,11 +1156,11 @@ en:
         title: Incomplete verifications
     site_customization:
       content_blocks:
-        form:
-          content_blocks_information: Information about content blocks
-          content_block_about: You can create HTML content blocks to be inserted in the header or the footer of your CONSUL.
-          content_block_top_links_html: "<strong>Header blocks (top_links)</strong> are blocks of links that must have this format:"
-          content_block_footer_html: "<strong>Footer blocks</strong> can have any format and can be used to insert Javascript, CSS or custom HTML."
+        information: Information about content blocks
+        about: You can create HTML content blocks to be inserted in the header or the footer of your CONSUL.
+        top_links_html: "<strong>Header blocks (top_links)</strong> are blocks of links that must have this format:"
+        footer_html: "<strong>Footer blocks</strong> can have any format and can be used to insert Javascript, CSS or custom HTML."
+        no_blocks: "There are no content blocks."
         create:
           notice: Content block created successfully
           error: Content block couldn't be created
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index dafc71f8d..9cd191095 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -1156,11 +1156,11 @@ es:
         title: Verificaciones incompletas
     site_customization:
       content_blocks:
-        form:
-          content_blocks_information: Información sobre los bloques de texto
-          content_block_about: Puedes crear bloques de HTML que se incrustarán en la cabecera o el pie de tu CONSUL.
-          content_block_top_links_html: "Los <strong>bloques de la cabecera (top_links)</strong> son bloques de enlaces que deben crearse con este formato:"
-          content_block_footer_html: "Los <strong>bloques del pie (footer)</strong> pueden tener cualquier formato y se pueden utilizar para guardar huellas Javascript, contenido CSS o contenido HTML personalizado."
+        information: Información sobre los bloques de texto
+        about: Puedes crear bloques de HTML que se incrustarán en la cabecera o el pie de tu CONSUL.
+        top_links_html: "Los <strong>bloques de la cabecera (top_links)</strong> son bloques de enlaces que deben crearse con este formato:"
+        footer_html: "Los <strong>bloques del pie (footer)</strong> pueden tener cualquier formato y se pueden utilizar para guardar huellas Javascript, contenido CSS o contenido HTML personalizado."
+        no_blocks: "No hay bloques de texto."
         create:
           notice: Bloque creado correctamente
           error: No se ha podido crear el bloque