diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade
index 4631f999b..9e4b9c61b 100644
--- a/client/components/boards/boardBody.jade
+++ b/client/components/boards/boardBody.jade
@@ -12,7 +12,6 @@ template(name="board")
     +spinner
 
 template(name="boardBody")
-  | {{currentSetting.customHTMLafterBodyStart}}
   .board-wrapper(class=currentBoard.colorClass)
     +sidebar
     .board-canvas.js-swimlanes.js-perfect-scrollbar(
@@ -28,7 +27,6 @@ template(name="boardBody")
         +listsGroup
       if isViewCalendar
         +calendarView
-  | {{currentSetting.customHTMLbeforeBodyEnd}}
 
 template(name="calendarView")
   .calendar-view.swimlane
diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade
index d0c27da52..b2c23920f 100644
--- a/client/components/main/layouts.jade
+++ b/client/components/main/layouts.jade
@@ -38,7 +38,9 @@ template(name="userFormsLayout")
 template(name="defaultLayout")
   +header
   #content
+    | {{{currentSetting.customHTMLafterBodyStart}}}
     +Template.dynamic(template=content)
+    | {{{currentSetting.customHTMLbeforeBodyEnd}}}
   if (Modal.isOpen)
     #modal
       .overlay