diff --git a/.eslintrc b/.eslintrc
index 71a86834ee8..441b7caf42f 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -55,6 +55,7 @@
 		"space-before-function-paren": [2, "never"],
 		"space-before-blocks": [2, "always"],
 		"indent": [2, "tab", {"SwitchCase": 1}],
+		"eol-last": [2, "always"],
 		"comma-dangle": [2, "never"],
 		"keyword-spacing": 2,
 		"block-spacing": 2,
diff --git a/packages/rocketchat-emoji/keyboardFix.js b/packages/rocketchat-emoji/keyboardFix.js
index 7bf03ead5c5..29788745807 100644
--- a/packages/rocketchat-emoji/keyboardFix.js
+++ b/packages/rocketchat-emoji/keyboardFix.js
@@ -11,4 +11,4 @@ if (Meteor.isCordova) {
 			RocketChat.EmojiPicker.setPosition();
 		}
 	});
-}
\ No newline at end of file
+}
diff --git a/packages/rocketchat-file-upload/lib/FileUpload.js b/packages/rocketchat-file-upload/lib/FileUpload.js
index f4fe43e253c..f6f82c3905f 100644
--- a/packages/rocketchat-file-upload/lib/FileUpload.js
+++ b/packages/rocketchat-file-upload/lib/FileUpload.js
@@ -57,4 +57,4 @@ FileUpload = {
 
 RocketChat.settings.get('FileUpload_MaxFileSize', function(key, value) {
 	maxFileSize = value;
-});
\ No newline at end of file
+});
diff --git a/packages/rocketchat-i18n/package.js b/packages/rocketchat-i18n/package.js
index de361dc9104..d7d520a85f5 100644
--- a/packages/rocketchat-i18n/package.js
+++ b/packages/rocketchat-i18n/package.js
@@ -17,4 +17,4 @@ Package.onUse(function(api) {
 	});
 
 	api.use('tap:i18n@1.8.2');
-});
\ No newline at end of file
+});
diff --git a/packages/rocketchat-livechat/client/collections/livechatOfficeHour.js b/packages/rocketchat-livechat/client/collections/livechatOfficeHour.js
index a741186d235..0cb4a81530e 100644
--- a/packages/rocketchat-livechat/client/collections/livechatOfficeHour.js
+++ b/packages/rocketchat-livechat/client/collections/livechatOfficeHour.js
@@ -1 +1 @@
-this.LivechatOfficeHour = new Mongo.Collection('rocketchat_livechat_office_hour');
\ No newline at end of file
+this.LivechatOfficeHour = new Mongo.Collection('rocketchat_livechat_office_hour');
diff --git a/packages/rocketchat-livechat/server/lib/OfficeClock.js b/packages/rocketchat-livechat/server/lib/OfficeClock.js
index 24591730e71..542f0adeec1 100644
--- a/packages/rocketchat-livechat/server/lib/OfficeClock.js
+++ b/packages/rocketchat-livechat/server/lib/OfficeClock.js
@@ -7,4 +7,4 @@ Meteor.setInterval(function() {
 			RocketChat.models.Users.closeOffice();
 		}
 	}
-}, 60000);
\ No newline at end of file
+}, 60000);
diff --git a/packages/rocketchat-livechat/server/methods/saveOfficeHours.js b/packages/rocketchat-livechat/server/methods/saveOfficeHours.js
index dc3b57fd167..2e4ba4fa9db 100644
--- a/packages/rocketchat-livechat/server/methods/saveOfficeHours.js
+++ b/packages/rocketchat-livechat/server/methods/saveOfficeHours.js
@@ -2,4 +2,4 @@ Meteor.methods({
 	'livechat:saveOfficeHours'(day, start, finish, open) {
 		RocketChat.models.LivechatOfficeHour.updateHours(day, start, finish, open);
 	}
-});
\ No newline at end of file
+});
diff --git a/packages/rocketchat-livechat/server/publications/livechatOfficeHours.js b/packages/rocketchat-livechat/server/publications/livechatOfficeHours.js
index b81ff8a53b0..566a79012a7 100644
--- a/packages/rocketchat-livechat/server/publications/livechatOfficeHours.js
+++ b/packages/rocketchat-livechat/server/publications/livechatOfficeHours.js
@@ -4,4 +4,4 @@ Meteor.publish('livechat:officeHour', function() {
 	}
 
 	return RocketChat.models.LivechatOfficeHour.find();
-});
\ No newline at end of file
+});
diff --git a/packages/rocketchat-slashcommands-inviteall/client.js b/packages/rocketchat-slashcommands-inviteall/client.js
index 911de18ffe0..1e6bd4917e8 100644
--- a/packages/rocketchat-slashcommands-inviteall/client.js
+++ b/packages/rocketchat-slashcommands-inviteall/client.js
@@ -5,4 +5,4 @@ RocketChat.slashCommands.add('invite-all-to', undefined, {
 RocketChat.slashCommands.add('invite-all-from', undefined, {
 	description: 'Invite_user_to_join_channel_all_from',
 	params: '#room'
-});
\ No newline at end of file
+});
diff --git a/server/methods/OEmbedCacheCleanup.js b/server/methods/OEmbedCacheCleanup.js
index 82d0fb68cf0..0dc8538d7d6 100644
--- a/server/methods/OEmbedCacheCleanup.js
+++ b/server/methods/OEmbedCacheCleanup.js
@@ -14,4 +14,4 @@ Meteor.methods({
 			message: 'cache_cleared'
 		};
 	}
-});
\ No newline at end of file
+});
diff --git a/tests/data/channel.js b/tests/data/channel.js
index 27fc4eb9c2c..616faab6b23 100644
--- a/tests/data/channel.js
+++ b/tests/data/channel.js
@@ -1,2 +1,2 @@
 export const publicChannelName = 'channel-test-'+Date.now();
-export const privateChannelName = 'private-channel-test-'+Date.now();
\ No newline at end of file
+export const privateChannelName = 'private-channel-test-'+Date.now();
diff --git a/tests/data/interactions.js b/tests/data/interactions.js
index 29b88637023..dbc78d07f2c 100644
--- a/tests/data/interactions.js
+++ b/tests/data/interactions.js
@@ -1,2 +1,2 @@
 export const targetUser = 'rocket.cat';
-export const imgURL = './public/images/logo/1024x1024.png';
\ No newline at end of file
+export const imgURL = './public/images/logo/1024x1024.png';
diff --git a/tests/end-to-end/ui/11-admin.js b/tests/end-to-end/ui/11-admin.js
index 6b9a32f6e46..fbdfe710e16 100644
--- a/tests/end-to-end/ui/11-admin.js
+++ b/tests/end-to-end/ui/11-admin.js
@@ -679,4 +679,4 @@ describe('Admin Login', () => {
 			});
 		});
 	});
-});
\ No newline at end of file
+});
diff --git a/tests/pageobjects/global.js b/tests/pageobjects/global.js
index 9eec4a50cc3..9a53e7790cd 100644
--- a/tests/pageobjects/global.js
+++ b/tests/pageobjects/global.js
@@ -13,4 +13,4 @@ class Global {
 	}
 }
 
-module.exports = new Global();
\ No newline at end of file
+module.exports = new Global();
diff --git a/tests/pageobjects/preferences-main-content.page.js b/tests/pageobjects/preferences-main-content.page.js
index aeae1b714f1..da2cb5f25be 100644
--- a/tests/pageobjects/preferences-main-content.page.js
+++ b/tests/pageobjects/preferences-main-content.page.js
@@ -39,4 +39,4 @@ class PreferencesMainContent extends Page {
 
 
 
-module.exports = new PreferencesMainContent();
\ No newline at end of file
+module.exports = new PreferencesMainContent();