diff --git a/HISTORY.md b/HISTORY.md
index af7537c30ca5a6f3814863e9acd126ba28488a45..cc61672d60295471f5857b029fe9eb5bccf0f558 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -2,6 +2,14 @@
 
 ## NEXT
 
+- [NEW] Permission `join-without-join-code` assigned to admins and bots by default (#6139)
+- [NEW] Integrations, both incoming and outgoing, now have access to the models. Example: `Users.findOneById(id)` (#6336)
+- [FIX] Incoming integrations would break when trying to use the `Store` feature.
+
+## 0.54.2 - 2017-Mar-24
+
+- [FIX] Auto Translate bug on Room Preview (#6355)
+
 ## 0.54.1 - 2017-Mar-23
 
 - [FIX] Images on attachments were not loading except for uploaded files.
@@ -329,7 +337,7 @@
 
 ### Now uses NodeJS 4.7.0
 
-- Fix integration payload JSON.parse 
+- Fix integration payload JSON.parse
 
 ## 0.48.0 - 2016-Dec-12
 
@@ -1059,7 +1067,7 @@
 - Removing presence status computation from new room sound tracker
 - Right sidebar animation cancelled on tab button clicked
 - Save room's name as the livechat visitor name
-- Use HTML emails instead of Text- 
+- Use HTML emails instead of Text-
 
 ## 0.30.0 - 2016-May-09
 
@@ -1308,7 +1316,7 @@
 - Fix ROOT_URL_PATH_PREFIX and add tab base
 - Fix text selection for cordova
 - Fix to package file/versions: - Do not depend on specific version of ostrio:cookies to use newer versions with fixes - Update all packages with latest versions
-- Improve the unread mark calculator 
+- Improve the unread mark calculator
 - Misc fixes to allow running from subdirectory rather than root (/)
 - Move i18n files to inside the lib package
 - Prevent to open message menu for long press in links on mobile
diff --git a/packages/rocketchat-autotranslate/client/lib/autotranslate.js b/packages/rocketchat-autotranslate/client/lib/autotranslate.js
index fed980278504b96a6cc80939dbf07aebc800c2c4..1301993914f1f1f1469e734192aa9ffbd2c6ae2a 100644
--- a/packages/rocketchat-autotranslate/client/lib/autotranslate.js
+++ b/packages/rocketchat-autotranslate/client/lib/autotranslate.js
@@ -7,7 +7,7 @@ RocketChat.AutoTranslate = {
 		if (rid) {
 			subscription = RocketChat.models.Subscriptions.findOne({ rid: rid }, { fields: { autoTranslateLanguage: 1 } });
 		}
-		const language = subscription.autoTranslateLanguage || Meteor.user().language || window.defaultUserLanguage();
+		const language = subscription && subscription.autoTranslateLanguage || Meteor.user().language || window.defaultUserLanguage();
 		if (language.indexOf('-') !== -1) {
 			if (!_.findWhere(this.supportedLanguages, { language })) {
 				return language.substr(0, 2);