diff --git a/.eslintrc.es6.json b/.eslintrc.es6.json
index c13b76aa57..647a4782ba 100644
--- a/.eslintrc.es6.json
+++ b/.eslintrc.es6.json
@@ -45,7 +45,6 @@
     "no-bitwise": 0,
     "arrow-body-style": 0,
     "prefer-template": 0,
-    "eol-last": 0,
     "keyword-spacing": 0,
     "default-case": 0,
     "quote-props": 0,
diff --git a/assets/js/src/form/fields/checkbox.jsx b/assets/js/src/form/fields/checkbox.jsx
index 461923ca4a..b70a2f0af8 100644
--- a/assets/js/src/form/fields/checkbox.jsx
+++ b/assets/js/src/form/fields/checkbox.jsx
@@ -46,4 +46,4 @@ define([
   });
 
   return FormFieldCheckbox;
-});
\ No newline at end of file
+});
diff --git a/assets/js/src/form/fields/date.jsx b/assets/js/src/form/fields/date.jsx
index 097771d983..2bafb563a1 100644
--- a/assets/js/src/form/fields/date.jsx
+++ b/assets/js/src/form/fields/date.jsx
@@ -248,4 +248,4 @@ define([
   };
 
   return FormFieldDate;
-});
\ No newline at end of file
+});
diff --git a/assets/js/src/form/fields/radio.jsx b/assets/js/src/form/fields/radio.jsx
index 8ac8affa87..9f221383f5 100644
--- a/assets/js/src/form/fields/radio.jsx
+++ b/assets/js/src/form/fields/radio.jsx
@@ -38,4 +38,4 @@ define([
   });
 
   return FormFieldRadio;
-});
\ No newline at end of file
+});
diff --git a/assets/js/src/form/fields/text.jsx b/assets/js/src/form/fields/text.jsx
index 0f0783d748..ed9faf7387 100644
--- a/assets/js/src/form/fields/text.jsx
+++ b/assets/js/src/form/fields/text.jsx
@@ -32,4 +32,4 @@ const FormFieldText = React.createClass({
   }
 });
 
-module.exports = FormFieldText;
\ No newline at end of file
+module.exports = FormFieldText;
diff --git a/assets/js/src/form/fields/textarea.jsx b/assets/js/src/form/fields/textarea.jsx
index 1167ec95c4..0ba61bd5a1 100644
--- a/assets/js/src/form/fields/textarea.jsx
+++ b/assets/js/src/form/fields/textarea.jsx
@@ -23,4 +23,4 @@ define([
   });
 
   return FormFieldTextarea;
-});
\ No newline at end of file
+});
diff --git a/assets/js/src/forms/forms.jsx b/assets/js/src/forms/forms.jsx
index e2b30abd58..dd97a0b36b 100644
--- a/assets/js/src/forms/forms.jsx
+++ b/assets/js/src/forms/forms.jsx
@@ -23,4 +23,4 @@ if(container) {
       </Route>
     </Router>
   ), container);
-}
\ No newline at end of file
+}
diff --git a/assets/js/src/help/knowledge_base.jsx b/assets/js/src/help/knowledge_base.jsx
index e02aa547e6..031077a9c0 100644
--- a/assets/js/src/help/knowledge_base.jsx
+++ b/assets/js/src/help/knowledge_base.jsx
@@ -26,4 +26,4 @@ function KnowledgeBase() {
   );
 };
 
-module.exports = KnowledgeBase;
\ No newline at end of file
+module.exports = KnowledgeBase;
diff --git a/assets/js/src/help/system_info.jsx b/assets/js/src/help/system_info.jsx
index e6f4da9c91..116f36012d 100644
--- a/assets/js/src/help/system_info.jsx
+++ b/assets/js/src/help/system_info.jsx
@@ -44,4 +44,4 @@ function KnowledgeBase() {
   );
 };
 
-module.exports = KnowledgeBase;
\ No newline at end of file
+module.exports = KnowledgeBase;
diff --git a/assets/js/src/listing/groups.jsx b/assets/js/src/listing/groups.jsx
index 65abeaacb3..826b01c02d 100644
--- a/assets/js/src/listing/groups.jsx
+++ b/assets/js/src/listing/groups.jsx
@@ -37,4 +37,4 @@ define(['react', 'classnames'], (React, classNames) => {
 
     return ListingGroups;
   }
-);
\ No newline at end of file
+);
diff --git a/assets/js/src/listing/header.jsx b/assets/js/src/listing/header.jsx
index 75c92ac5ff..fe8a85831e 100644
--- a/assets/js/src/listing/header.jsx
+++ b/assets/js/src/listing/header.jsx
@@ -88,4 +88,4 @@ const ListingColumn = React.createClass({
   }
 });
 
-module.exports = ListingHeader;
\ No newline at end of file
+module.exports = ListingHeader;
diff --git a/assets/js/src/newsletters/listings/mixins.jsx b/assets/js/src/newsletters/listings/mixins.jsx
index 8de0c1e1ba..c2c43ffc79 100644
--- a/assets/js/src/newsletters/listings/mixins.jsx
+++ b/assets/js/src/newsletters/listings/mixins.jsx
@@ -376,4 +376,4 @@ const _MailerMixin = {
 
 export { _QueueMixin as QueueMixin };
 export { _StatisticsMixin as StatisticsMixin };
-export { _MailerMixin as MailerMixin };
\ No newline at end of file
+export { _MailerMixin as MailerMixin };
diff --git a/assets/js/src/newsletters/listings/notification_history.jsx b/assets/js/src/newsletters/listings/notification_history.jsx
index 5612660e55..4056d82532 100644
--- a/assets/js/src/newsletters/listings/notification_history.jsx
+++ b/assets/js/src/newsletters/listings/notification_history.jsx
@@ -129,4 +129,4 @@ const NewsletterListNotificationHistory = React.createClass({
   }
 });
 
-module.exports = NewsletterListNotificationHistory;
\ No newline at end of file
+module.exports = NewsletterListNotificationHistory;
diff --git a/assets/js/src/newsletters/listings/tabs.jsx b/assets/js/src/newsletters/listings/tabs.jsx
index 634d3108b4..32027ef047 100644
--- a/assets/js/src/newsletters/listings/tabs.jsx
+++ b/assets/js/src/newsletters/listings/tabs.jsx
@@ -50,4 +50,4 @@ const ListingTabs = React.createClass({
   }
 });
 
-module.exports = ListingTabs;
\ No newline at end of file
+module.exports = ListingTabs;
diff --git a/assets/js/src/segments/segments.jsx b/assets/js/src/segments/segments.jsx
index ba88d0eb95..31f050ff75 100644
--- a/assets/js/src/segments/segments.jsx
+++ b/assets/js/src/segments/segments.jsx
@@ -27,4 +27,4 @@ if(container) {
       </Route>
     </Router>
   ), container);
-}
\ No newline at end of file
+}
diff --git a/assets/js/src/subscribers/subscribers.jsx b/assets/js/src/subscribers/subscribers.jsx
index 980fca2738..abc35fe1d6 100644
--- a/assets/js/src/subscribers/subscribers.jsx
+++ b/assets/js/src/subscribers/subscribers.jsx
@@ -26,4 +26,4 @@ if(container) {
       </Route>
     </Router>
   ), container);
-}
\ No newline at end of file
+}