diff --git a/server/methods/setUserPassword.js b/server/methods/setUserPassword.js
index 40b7fda7c3438b13c66c60de02df91a975306ab1..327e523770aa7ef0efee956ac6f841be443b81b5 100644
--- a/server/methods/setUserPassword.js
+++ b/server/methods/setUserPassword.js
@@ -2,13 +2,14 @@ Meteor.methods({
 	setUserPassword(password) {
 		check(password, String);
 
-		if (!Meteor.userId()) {
+		const userId = Meteor.userId();
+
+		if (!userId) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', {
 				method: 'setUserPassword'
 			});
 		}
 
-		const userId = Meteor.userId();
 		const user = RocketChat.models.Users.findOneById(userId);
 
 		if (user && user.requirePasswordChange !== true) {