diff --git a/app/models/communication/block/template/definition.rb b/app/models/communication/block/template/definition.rb
index 5b444b4049d5d4006a5d99bb7fd7abb3007a8104..7a59e07eac23a8a6e7edd4d5b351e1a2ef9582aa 100644
--- a/app/models/communication/block/template/definition.rb
+++ b/app/models/communication/block/template/definition.rb
@@ -1,5 +1,6 @@
 class Communication::Block::Template::Definition < Communication::Block::Template::Base
 
   has_elements
+  has_component :description, :rich_text
 
 end
diff --git a/app/views/admin/communication/blocks/edit.html.erb b/app/views/admin/communication/blocks/edit.html.erb
index 940c473ec23af60f7dbb6806b0974377a349e4b5..b37fbbce4fca304a647bede0179c82a769db3831 100644
--- a/app/views/admin/communication/blocks/edit.html.erb
+++ b/app/views/admin/communication/blocks/edit.html.erb
@@ -29,7 +29,7 @@
     </textarea>
     <% content_for :action_bar_left do %>
       <%= destroy_link @block %>
-      <%= link_to 'Dependencies', 
+      <%= link_to 'Dependencies',
                   [:admin, @block],
                   class: button_classes('btn-light') if current_user.server_admin? %>
     <% end %>
@@ -54,12 +54,8 @@
           blobUrlTemplate: "<%= rails_service_blob_url(":signed_id", ":filename").html_safe %>"
         },
         data: <%= @block.data.to_json.html_safe %>,
-        <% if @block.template.default_element %>
-        defaultElement: <%= @block.template
-                                  .default_element
-                                  .default_data
-                                  .to_json
-                                  .html_safe %>
+        <% if @element %>
+        defaultElement: <%= @element.default_data.to_json.html_safe %>
         <% end %>
       }
     },
diff --git a/app/views/admin/communication/blocks/templates/definitions/_edit.html.erb b/app/views/admin/communication/blocks/templates/definitions/_edit.html.erb
index d9967a01c44d5d54e196e6a63e3a1f15b4e143fc..36a020b0cb77769dfaa96b8bffc48d6d944cdbaf 100644
--- a/app/views/admin/communication/blocks/templates/definitions/_edit.html.erb
+++ b/app/views/admin/communication/blocks/templates/definitions/_edit.html.erb
@@ -1,4 +1,8 @@
-<% element = @block.template.default_element %>
+<div class="row">
+  <div class="col-xl-6">
+    <%= block_component_edit :description %>
+  </div>
+</div>
 
 <%= block_component_add_element t('.add_definition') %>
 
@@ -15,10 +19,10 @@
           <div class="flex-fill">
             <div class="row mb-n3">
               <div class="col-lg-5">
-                <%= block_component_edit :title, template: element %>
+                <%= block_component_edit :title, template: @element %>
               </div>
               <div class="col-lg-7">
-                <%= block_component_edit :description, template: element %>
+                <%= block_component_edit :description, template: @element %>
               </div>
             </div>
           </div>
diff --git a/app/views/admin/communication/blocks/templates/definitions/_preview.html.erb b/app/views/admin/communication/blocks/templates/definitions/_preview.html.erb
index c6b542a6b504be026b7718c7f2e534fb94b4024f..1b04433fc3c26e946ed2cb0b91c9731efe1e1059 100644
--- a/app/views/admin/communication/blocks/templates/definitions/_preview.html.erb
+++ b/app/views/admin/communication/blocks/templates/definitions/_preview.html.erb
@@ -1,3 +1,6 @@
+<div class="description">
+  <%= block_component_preview :description %>
+</div>
 <div class="definitions">
   <% @block.template.elements.each do |element| %>
     <details itemscope itemtype="https://schema.org/DefinedTerm">
diff --git a/app/views/admin/communication/blocks/templates/definitions/_static.html.erb b/app/views/admin/communication/blocks/templates/definitions/_static.html.erb
index dfdf9bfae6cff2311b5a894060ed8b10120c8efc..fd9afb253e4bc0e1f2db8c83fd9bc371fb5e72dc 100644
--- a/app/views/admin/communication/blocks/templates/definitions/_static.html.erb
+++ b/app/views/admin/communication/blocks/templates/definitions/_static.html.erb
@@ -1,3 +1,4 @@
+<%= block_component_static :description %>
       elements:
 <% block.template.elements.each do |element| %>
 <%= block_component_static :title, template: element, list: true, depth: 4 %>
diff --git a/app/views/admin/communication/blocks/templates/testimonials/_edit.html.erb b/app/views/admin/communication/blocks/templates/testimonials/_edit.html.erb
index 2776eed689128787a3c0b82c1dcbacd099bd384a..fbc91a554e321f4615db6c5701e886ac800515f0 100644
--- a/app/views/admin/communication/blocks/templates/testimonials/_edit.html.erb
+++ b/app/views/admin/communication/blocks/templates/testimonials/_edit.html.erb
@@ -1,5 +1,3 @@
-<% element = @block.template.default_element %>
-
 <%= block_component_add_element t('.add_testimonial') %>
 
 <draggable :list="data.elements" handle=".dragHandle" class="row">
@@ -13,14 +11,14 @@
       <div class="flex-fill">
         <div class="row mb-n3">
           <div class="col-lg-4">
-            <%= block_component_edit :text, template: element %>
+            <%= block_component_edit :text, template: @element %>
           </div>
           <div class="col-lg-4">
-            <%= block_component_edit :author, template: element %>
-            <%= block_component_edit :job, template: element %>
+            <%= block_component_edit :author, template: @element %>
+            <%= block_component_edit :job, template: @element %>
           </div>
           <div class="col-lg-4">
-            <%= block_component_edit :photo, template: element %>
+            <%= block_component_edit :photo, template: @element %>
           </div>
         </div>
       </div>
diff --git a/config/locales/communication/fr.yml b/config/locales/communication/fr.yml
index 8ba6c06745de3c7ae448dbf9e177c515c80a1fb4..8b859957eed3033946da8cba02f38c6b92ffae4b 100644
--- a/config/locales/communication/fr.yml
+++ b/config/locales/communication/fr.yml
@@ -285,6 +285,8 @@ fr:
             edit:
               add_definition: Ajouter une définition
               remove_definition: Supprimer la définition
+              description:
+                label: Description
               element:
                 title:
                   label: Titre