diff --git a/.template-lintrc.js b/.template-lintrc.js
index 0a26ee1992..1f377ea0f1 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -30,7 +30,7 @@ module.exports = {
     "no-log": true,
     "no-negated-condition": true,
     "no-nested-interactive": true,
-    "no-multiple-empty-lines": false,
+    "no-multiple-empty-lines": true,
     "no-obsolete-elements": true,
     "no-outlet-outside-routes": true,
     "no-partial": true,
diff --git a/app/assets/javascripts/admin/templates/admin.hbs b/app/assets/javascripts/admin/templates/admin.hbs
index aec3433a0b..2396114db6 100644
--- a/app/assets/javascripts/admin/templates/admin.hbs
+++ b/app/assets/javascripts/admin/templates/admin.hbs
@@ -29,11 +29,9 @@
         {{/if}}
         {{nav-item route='adminPlugins' label='admin.plugins.title'}}
         {{plugin-outlet name="admin-menu" connectorTagName="" tagName=""}}
-
       </ul>
       </div>
 
-
       <div class='boxed white admin-content'>
         <div class='admin-contents {{adminContentsClassName}}'>
           {{outlet}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs b/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
index ad669f4d3d..ba31c888c3 100644
--- a/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
+++ b/app/assets/javascripts/admin/templates/components/admin-theme-editor.hbs
@@ -87,7 +87,6 @@
     </nav>
 </div>
 
-
 {{#if error}}
     <pre class='field-error'>{{error}}</pre>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/themes-list.hbs b/app/assets/javascripts/admin/templates/components/themes-list.hbs
index 4654371a23..2bfbc8843b 100644
--- a/app/assets/javascripts/admin/templates/components/themes-list.hbs
+++ b/app/assets/javascripts/admin/templates/components/themes-list.hbs
@@ -44,8 +44,6 @@
       <span class="empty">{{i18n "admin.customize.theme.empty"}}</span>
     </div>
   {{/if}}
-
-
 </div>
 
 <div class="create-actions">
diff --git a/app/assets/javascripts/admin/templates/plugins-index.hbs b/app/assets/javascripts/admin/templates/plugins-index.hbs
index 9370d8457c..d3d7c23785 100644
--- a/app/assets/javascripts/admin/templates/plugins-index.hbs
+++ b/app/assets/javascripts/admin/templates/plugins-index.hbs
@@ -1,9 +1,6 @@
 {{#if model.length}}
-
-
   <h3>{{i18n "admin.plugins.installed"}}</h3>
 
-
   <table class="admin-plugins grid">
     <thead>
       <tr>
diff --git a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
index bf75d0929a..9820cb33a0 100644
--- a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
@@ -29,7 +29,6 @@
     <span class="btn {{unless uploading 'hidden'}}">{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>
   </div>
 
-
   {{#if imageUrl}}
     <a class="lightbox"
        href={{imageCDNURL}}
diff --git a/app/assets/javascripts/discourse/templates/components/share-popup.hbs b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
index 54e8029cf6..c61f43cf64 100644
--- a/app/assets/javascripts/discourse/templates/components/share-popup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/share-popup.hbs
@@ -35,7 +35,6 @@
       </div>
     {{/if}}
 
-
     {{d-button action="close" class="btn btn-flat close" icon="times" aria-label="share.close" title="share.close"}}
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/preferences/account.hbs b/app/assets/javascripts/discourse/templates/preferences/account.hbs
index 3f02b15238..70b8d20cd8 100644
--- a/app/assets/javascripts/discourse/templates/preferences/account.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/account.hbs
@@ -165,7 +165,6 @@
   </div>
 {{/if}}
 
-
 {{#if canCheckEmails}}
   <div class="control-group pref-auth-tokens">
     <label class="control-label">{{i18n 'user.auth_tokens.title'}}</label>
@@ -218,7 +217,6 @@
   {{save-controls model=model action=(action "save") saved=saved}}
 {{/if}}
 
-
 {{#if model.canDeleteAccount}}
   <div class="control-group delete-account">
     <br>
diff --git a/app/assets/javascripts/discourse/templates/preferences/categories.hbs b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
index b0fc96c15b..dacfbc1c8b 100644
--- a/app/assets/javascripts/discourse/templates/preferences/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/categories.hbs
@@ -14,7 +14,6 @@
   </div>
   <div class="instructions">{{i18n 'user.watched_categories_instructions'}}</div>
 
-
   <div class="controls tracking-controls">
     <label>{{d-icon "d-tracking"}} {{i18n 'user.tracked_categories'}}</label>
     {{#if canSee}}
@@ -28,7 +27,6 @@
   </div>
   <div class="instructions">{{i18n 'user.tracked_categories_instructions'}}</div>
 
-
   <div class="controls tracking-controls">
     <label>{{d-icon "d-watching-first"}} {{i18n 'user.watched_first_post_categories'}}</label>
     {{category-selector
diff --git a/app/assets/javascripts/discourse/templates/preferences/interface.hbs b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
index 338a7d883e..acd5aa60bb 100644
--- a/app/assets/javascripts/discourse/templates/preferences/interface.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/interface.hbs
@@ -54,7 +54,6 @@
   </div>
 {{/if}}
 
-
 <div class="control-group home">
   <label class="control-label">{{i18n 'user.home'}}</label>
   <div class="controls">
diff --git a/app/assets/javascripts/discourse/templates/preferences/profile.hbs b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
index fded99a5fd..fed0da9e91 100644
--- a/app/assets/javascripts/discourse/templates/preferences/profile.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/profile.hbs
@@ -87,7 +87,6 @@
   </div>
 {{/if}}
 
-
 {{plugin-outlet name="user-preferences-profile" args=(hash model=model save=(action "save"))}}
 
 {{plugin-outlet name="user-custom-preferences" args=(hash model=model)}}
diff --git a/app/assets/javascripts/discourse/templates/preferences/users.hbs b/app/assets/javascripts/discourse/templates/preferences/users.hbs
index d4c183c3a0..799b9c5c5a 100644
--- a/app/assets/javascripts/discourse/templates/preferences/users.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/users.hbs
@@ -27,5 +27,4 @@
 
 {{plugin-outlet name="user-custom-controls" args=(hash model=model)}}
 
-
 {{#save-controls model=model action=(action "save") saved=saved}}{{/save-controls}}
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index c79b3da18a..c6297b021d 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -87,7 +87,6 @@
       {{/topic-title}}
     {{/if}}
 
-
     <div class="container posts">
       <div class='selected-posts {{unless multiSelect 'hidden'}}'>
         {{selected-posts