diff --git a/packages/rocketchat-lib/server/lib/debug.js b/packages/rocketchat-lib/server/lib/debug.js
index f5ca069d8a04..35e8a92989d3 100644
--- a/packages/rocketchat-lib/server/lib/debug.js
+++ b/packages/rocketchat-lib/server/lib/debug.js
@@ -56,7 +56,17 @@ const wrapMethods = function(name, originalHandler, methodsMap) {
 		const args = name === 'ufsWrite' ? Array.prototype.slice.call(originalArgs, 1) : originalArgs;
 		logger.method(name, '-> userId:', Meteor.userId(), ', arguments: ', args);
 
-		this.unblock();
+		// Temporary solution for a hotfix while we investigate the underlying issue.
+		const methodBlackList = [
+			'resetPassword',
+			'verifyEmail',
+			'resetPasswordWithTOTP',
+		];
+
+		if (methodBlackList.indexOf(name) < 0) {
+			this.unblock();
+		}
+
 		const result = originalHandler.apply(this, originalArgs);
 		end();
 		return result;