diff --git a/packages/rocketchat-api/server/v1/users.js b/packages/rocketchat-api/server/v1/users.js
index 6e7fdada41e..e4c4c58e1ed 100644
--- a/packages/rocketchat-api/server/v1/users.js
+++ b/packages/rocketchat-api/server/v1/users.js
@@ -323,7 +323,7 @@ RocketChat.API.v1.addRoute('users.setPreferences', { authRequired: true }, {
 		if (this.bodyParams.data.language) {
 			const language = this.bodyParams.data.language;
 			delete this.bodyParams.data.language;
-			preferences = _.extend({ _id: this.bodyParams.userId, settings: { preferences: this.bodyParams.data }, language: language });
+			preferences = _.extend({ _id: this.bodyParams.userId, settings: { preferences: this.bodyParams.data }, language });
 		} else {
 			preferences = _.extend({ _id: this.bodyParams.userId, settings: { preferences: this.bodyParams.data }});
 		}
diff --git a/packages/rocketchat-lib/server/functions/saveUser.js b/packages/rocketchat-lib/server/functions/saveUser.js
index a2cb5134798..e5c7dd10af5 100644
--- a/packages/rocketchat-lib/server/functions/saveUser.js
+++ b/packages/rocketchat-lib/server/functions/saveUser.js
@@ -166,8 +166,8 @@ RocketChat.saveUser = function(userId, userData) {
 
 		if (userData.settings) {
 			updateUser.$set.settings = { preferences: {} };
-			if (userData.settings.preferences) {
-				for (let key in userData.settings.preferences) {
+			for (const key in userData.settings.preferences) {
+				if (userData.settings.preferences[key]) {
 					updateUser.$set.settings.preferences[key] = userData.settings.preferences[key];
 				}
 			}