diff --git a/.erb-lint.yml b/.erb-lint.yml
index 71b368cee..85585e4ab 100644
--- a/.erb-lint.yml
+++ b/.erb-lint.yml
@@ -8,6 +8,8 @@ linters:
     enabled: true
   SpaceInHtmlTag:
     enabled: true
+  TrailingWhitespace:
+    enabled: true
   Rubocop:
     enabled: true
     only:
diff --git a/app/views/admin/banners/_errors.html.erb b/app/views/admin/banners/_errors.html.erb
index e50720971..d585cccee 100644
--- a/app/views/admin/banners/_errors.html.erb
+++ b/app/views/admin/banners/_errors.html.erb
@@ -1,6 +1,6 @@
 
 <% if @banner.errors.any? %>
-   
+
   <div id="error_explanation" data-alert class="callout alert" data-closable>
     <button class="close-button" aria-label="<%= t("application.close") %>" type="button" data-close>
       <span aria-hidden="true">&times;</span>
diff --git a/app/views/admin/stats/polls.html.erb b/app/views/admin/stats/polls.html.erb
index c2b0b8481..fae840f07 100644
--- a/app/views/admin/stats/polls.html.erb
+++ b/app/views/admin/stats/polls.html.erb
@@ -76,7 +76,7 @@
         <th></th>
         <th class="name text-right">
           <strong>
-            <%= t("admin.stats.polls.table.origin_total") %>: 
+            <%= t("admin.stats.polls.table.origin_total") %>:
             <%= ::Poll::Answer.where(question: poll.questions)
                               .select(:author_id).distinct.count %>
           </strong>
diff --git a/app/views/admin/valuator_groups/_valuator.html.erb b/app/views/admin/valuator_groups/_valuator.html.erb
index 8f98a8173..5c7bf71f8 100644
--- a/app/views/admin/valuator_groups/_valuator.html.erb
+++ b/app/views/admin/valuator_groups/_valuator.html.erb
@@ -1,4 +1,4 @@
 <li>
-  <%= link_to valuator.description_or_email, 
+  <%= link_to valuator.description_or_email,
               admin_valuator_path(valuator) %>
 </li>
\ No newline at end of file
diff --git a/app/views/devise/password_expired/show.html.erb b/app/views/devise/password_expired/show.html.erb
index 33dc82f71..bba3e1d13 100644
--- a/app/views/devise/password_expired/show.html.erb
+++ b/app/views/devise/password_expired/show.html.erb
@@ -4,10 +4,10 @@
 
   <%= f.password_field :current_password %></p>
 
-  <%= f.label t("devise.password_expired.new_password") %> 
+  <%= f.label t("devise.password_expired.new_password") %>
   <%= f.password_field :password, label: false %></p>
- 
+
   <%= f.password_field :password_confirmation %></p>
 
   <p><%= f.submit t("devise.password_expired.change_password") %></p>
-<% end %> 
\ No newline at end of file
+<% end %>
\ No newline at end of file
diff --git a/app/views/topics/_filter_subnav.html.erb b/app/views/topics/_filter_subnav.html.erb
index f6762dcce..25a701270 100644
--- a/app/views/topics/_filter_subnav.html.erb
+++ b/app/views/topics/_filter_subnav.html.erb
@@ -11,7 +11,7 @@
           </h3>
         <% end %>
       </li>
-      
+
     </ul>
 
   </div>
diff --git a/config/initializers/devise_security_extension.rb b/config/initializers/devise_security_extension.rb
index 6e691acbe..f72d8b3ec 100644
--- a/config/initializers/devise_security_extension.rb
+++ b/config/initializers/devise_security_extension.rb
@@ -42,7 +42,7 @@ module Devise
     module PasswordExpirable
       def need_change_password?
         self.administrator? && password_expired?
-      end 
+      end
 
       def password_expired?
         self.password_changed_at < self.expire_password_after.ago