diff --git a/app/views/blocks/link_list.html.erb b/app/views/blocks/link_list.html.erb
index f5ea223..5c7dc29 100644
--- a/app/views/blocks/link_list.html.erb
+++ b/app/views/blocks/link_list.html.erb
@@ -1,5 +1,7 @@
 <%= block_title(block.title) %>
 
+<%= block.links.empty? && block.title.empty? ? content_tag('em', _('Please, edit this block to add links')) : '' %>
+
 <ul>
   <% block.links.select{|i| !i[:name].blank? and !i[:address].blank?}.each do |link| %>
     <li>
diff --git a/test/unit/link_list_block_test.rb b/test/unit/link_list_block_test.rb
index 2920bf2..7a94c8d 100644
--- a/test/unit/link_list_block_test.rb
+++ b/test/unit/link_list_block_test.rb
@@ -134,4 +134,9 @@ class LinkListBlockTest < ActiveSupport::TestCase
     assert_match /title="mytitle"/, render_block_content(l)
   end
 
+  should 'display default message to brand new blocks with no links' do
+    l = LinkListBlock.new
+    assert_match /Please, edit this block to add links/, render_block_content(l)
+  end
+
 end
--
libgit2 0.21.2