diff --git a/app/api/server/v1/rooms.js b/app/api/server/v1/rooms.js
index 0d9d6c36806fd..35707c919b82d 100644
--- a/app/api/server/v1/rooms.js
+++ b/app/api/server/v1/rooms.js
@@ -365,7 +365,7 @@ API.v1.addRoute('rooms.export', { authRequired: true }, {
 			throw new Meteor.Error('error-invalid-params');
 		}
 
-		if (!hasPermission(this.userId, 'mail-messages')) {
+		if (!hasPermission(this.userId, 'mail-messages', rid)) {
 			throw new Meteor.Error('error-action-not-allowed', 'Mailing is not allowed');
 		}
 
diff --git a/client/startup/contextualBar/exportMessages.js b/client/startup/contextualBar/exportMessages.js
index 739d5ddc7e68c..d0d61c0f8c521 100644
--- a/client/startup/contextualBar/exportMessages.js
+++ b/client/startup/contextualBar/exportMessages.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Session } from 'meteor/session';
 
 import { TabBar } from '../../../app/ui-utils/client';
 import { hasAllPermission } from '../../../app/authorization/client';
@@ -13,6 +14,6 @@ Meteor.startup(() => {
 		template: 'ExportMessages',
 		full: true,
 		order: 12,
-		condition: () => hasAllPermission('mail-messages'),
+		condition: () => hasAllPermission('mail-messages', Session.get('openedRoom')),
 	});
 });