diff --git a/templates/web/prod/Share/record.html.twig b/templates/web/prod/Share/record.html.twig
index ab2b3bd771..6fdecb50d3 100644
--- a/templates/web/prod/Share/record.html.twig
+++ b/templates/web/prod/Share/record.html.twig
@@ -65,15 +65,19 @@
                 <div class="form-group clearfix">
                     {#{% if type == 'image' %}#}
                     <label>{% trans %}Embed code{% endtrans %}</label>
+                    {%  set embedUrl = subdefList[defKey].embedUrl %}
+                    {% if subdefList[defKey].height == 0 %}
+                        {%  set defKey = 'thumbnail'  %}
+                    {% endif %}
                     {% spaceless %}
                         <textarea class="input-block-level" rows="4" readonly="true" id="embedRecordUrl">
-                                <iframe width="{{ subdefList[defKey].width }}" height="{{ subdefList[defKey].height }}"
-                                        src="{{ subdefList[defKey].embedUrl }}" frameborder="0"
+                                <iframe width="{{ subdefList[defKey].width != 0 ?subdefList[defKey].width : 240 }}" height="{{subdefList[defKey].height != 0 ? subdefList[defKey].height : 240 }}"
+                                        src="{{ embedUrl }}" frameborder="0"
                                         allowfullscreen></iframe>
                             </textarea>
                     {% endspaceless %}
                     <p class="pull-right">
-                        <a id="embedRecordUrl-link" href="{{ subdefList[defKey].embedUrl }}"
+                        <a id="embedRecordUrl-link" href="{{ embedUrl }}"
                            target="_blank">{{ 'previewLinkLabel' | trans }}</a> &nbsp;&nbsp;
                         <a href="#" class="" id="embedCopy">{{ 'copyClipboardLabel' | trans }}</a>
                     </p>
diff --git a/templates/web/prod/actions/Tools/videoEditor.html.twig b/templates/web/prod/actions/Tools/videoEditor.html.twig
index a788b2707a..0c70c7c7ba 100644
--- a/templates/web/prod/actions/Tools/videoEditor.html.twig
+++ b/templates/web/prod/actions/Tools/videoEditor.html.twig
@@ -229,7 +229,7 @@
             {% endfor %}
         ],
         preferences: {
-            overlapChapters: {% if overlapChapters != NULL %}{{ overlapChapters }}{% else %}0{% endif %},
+            overlapChapters: {% if overlapChapters != NULL %}{{ overlapChapters }}{% else %}1{% endif %},
         }
 
     };