diff --git a/.eslintrc.json b/.eslintrc.json
index e1cc3e6a2d..ef6e559e6c 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -20,6 +20,7 @@
     "react/react-in-jsx-scope": 1,
     "no-console": 0,
     "no-case-declarations": 0,
-    "quotes": ["error", "single"]
+    "quotes": ["error", "single"],
+    "eol-last": ["error", "always"]
   }
 }
diff --git a/src/components/ColumnsConfiguration/ColumnConfigurationItem.react.js b/src/components/ColumnsConfiguration/ColumnConfigurationItem.react.js
index a681b5d0f6..087e88b385 100644
--- a/src/components/ColumnsConfiguration/ColumnConfigurationItem.react.js
+++ b/src/components/ColumnsConfiguration/ColumnConfigurationItem.react.js
@@ -40,4 +40,4 @@ export default ({ name, handleColumnDragDrop, index, onChangeVisible, visible })
       </div>
     </section>
   ));
-};
\ No newline at end of file
+};
diff --git a/src/components/GeoPointInput/GeoPointInput.react.js b/src/components/GeoPointInput/GeoPointInput.react.js
index 8711301e18..c80484519b 100644
--- a/src/components/GeoPointInput/GeoPointInput.react.js
+++ b/src/components/GeoPointInput/GeoPointInput.react.js
@@ -52,4 +52,4 @@ export default class GeoPointInput extends React.Component {
       </div>
     );
   }
-}
\ No newline at end of file
+}
diff --git a/src/components/IntervalInput/IntervalInput.react.js b/src/components/IntervalInput/IntervalInput.react.js
index 5e4fbe8cf6..97afccbe7b 100644
--- a/src/components/IntervalInput/IntervalInput.react.js
+++ b/src/components/IntervalInput/IntervalInput.react.js
@@ -45,4 +45,4 @@ IntervalInput.propTypes = {
   count: PropTypes.number.isRequired,
   unit: PropTypes.oneOf(['minute', 'hour']),
   onChange: PropTypes.func.isRequired
-};
\ No newline at end of file
+};
diff --git a/src/components/PushCerts/PushCerts.react.js b/src/components/PushCerts/PushCerts.react.js
index 20a3aaedc4..fcff72e3fb 100644
--- a/src/components/PushCerts/PushCerts.react.js
+++ b/src/components/PushCerts/PushCerts.react.js
@@ -59,4 +59,4 @@ PushCerts.propTypes = {
   ),
 };
 
-export default PushCerts;
\ No newline at end of file
+export default PushCerts;
diff --git a/src/components/Sidebar/AppName.react.js b/src/components/Sidebar/AppName.react.js
index 3856cedf15..93053923a6 100644
--- a/src/components/Sidebar/AppName.react.js
+++ b/src/components/Sidebar/AppName.react.js
@@ -15,4 +15,4 @@ const AppName = ({ name, onClick, onPinClick }) => (
   </div>
 );
 
-export default AppName;
\ No newline at end of file
+export default AppName;
diff --git a/src/components/TimeInput/TimeInput.react.js b/src/components/TimeInput/TimeInput.react.js
index 0761038c32..2eab73c29c 100644
--- a/src/components/TimeInput/TimeInput.react.js
+++ b/src/components/TimeInput/TimeInput.react.js
@@ -40,4 +40,4 @@ let TimeInput = ({ hours, minutes, onChange }) => {
   );
 };
 
-export default TimeInput;
\ No newline at end of file
+export default TimeInput;
diff --git a/src/components/Tooltip/PopperTooltip.react.js b/src/components/Tooltip/PopperTooltip.react.js
index 234dac4e7b..b1ee727057 100644
--- a/src/components/Tooltip/PopperTooltip.react.js
+++ b/src/components/Tooltip/PopperTooltip.react.js
@@ -31,4 +31,4 @@ const PopperTooltip = (props) => {
   );
 }
 
-export default PopperTooltip;
\ No newline at end of file
+export default PopperTooltip;
diff --git a/src/dashboard/Data/Browser/LoginDialog.react.js b/src/dashboard/Data/Browser/LoginDialog.react.js
index a3bb03c498..80f7ff11e1 100644
--- a/src/dashboard/Data/Browser/LoginDialog.react.js
+++ b/src/dashboard/Data/Browser/LoginDialog.react.js
@@ -109,4 +109,4 @@ export default class LoginDialog extends React.Component {
 
 LoginDialog.contextTypes = {
   currentApp: PropTypes.instanceOf(ParseApp)
-};
\ No newline at end of file
+};
diff --git a/src/lib/Email.js b/src/lib/Email.js
index c1083d08f4..c3b7cd1fbc 100644
--- a/src/lib/Email.js
+++ b/src/lib/Email.js
@@ -148,4 +148,4 @@ export function suggestion(email, checkTLD) {
     return null;
   }
   return match[1] + '@' + closestDomain;
-}
\ No newline at end of file
+}
diff --git a/src/lib/Filters.js b/src/lib/Filters.js
index f95a705a93..c53e41a008 100644
--- a/src/lib/Filters.js
+++ b/src/lib/Filters.js
@@ -233,4 +233,4 @@ export function availableFilters(schema, currentFilters, blacklist) {
   return available;
 }
 
-export const BLACKLISTED_FILTERS = [ 'containsAny', 'doesNotContainAny' ];
\ No newline at end of file
+export const BLACKLISTED_FILTERS = [ 'containsAny', 'doesNotContainAny' ];
diff --git a/src/lib/isInsidePopover.js b/src/lib/isInsidePopover.js
index a5d7457980..f2ec37a3c0 100644
--- a/src/lib/isInsidePopover.js
+++ b/src/lib/isInsidePopover.js
@@ -9,4 +9,4 @@ export default function isInsidePopover(node) {
       cur = cur.parentNode;
   }
   return false;
-}
\ No newline at end of file
+}
diff --git a/src/lib/stores/StateManager.js b/src/lib/stores/StateManager.js
index 01b0541df7..216dcbfa67 100644
--- a/src/lib/stores/StateManager.js
+++ b/src/lib/stores/StateManager.js
@@ -65,4 +65,4 @@ export function setGlobalState(name, state) {
   let prev = getGlobalState(name);
   globalStates[name] = state;
   return prev;
-}
\ No newline at end of file
+}
diff --git a/src/lib/stores/StoreManager.js b/src/lib/stores/StoreManager.js
index 7eca956810..dd12cbf4de 100644
--- a/src/lib/stores/StoreManager.js
+++ b/src/lib/stores/StoreManager.js
@@ -74,4 +74,4 @@ export function getStore(name) {
       delete storeData.subscribers[id];
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/lib/subscribeTo.js b/src/lib/subscribeTo.js
index 9d5a8ac765..6f245e878d 100644
--- a/src/lib/subscribeTo.js
+++ b/src/lib/subscribeTo.js
@@ -71,4 +71,4 @@ export default function subscribeTo(name, prop) {
 
     return SubscribedComponent;
   };
-}
\ No newline at end of file
+}