diff --git a/public/language/en-GB/admin/manage/groups.json b/public/language/en-GB/admin/manage/groups.json
index a26e51aafa..911fcce010 100644
--- a/public/language/en-GB/admin/manage/groups.json
+++ b/public/language/en-GB/admin/manage/groups.json
@@ -34,8 +34,6 @@
 	"edit.hidden-details": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
 	"edit.add-user": "Add User to Group",
 	"edit.add-user-search": "Search Users",
-	"edit.autojoin": "Enable Auto-Join",
-	"edit.autojoin-details": "Allow any user with access to the group to join without confirmation",
 	"edit.members": "Member List",
 	"control-panel": "Groups Control Panel",
 	"revert": "Revert",
diff --git a/public/language/en-GB/groups.json b/public/language/en-GB/groups.json
index 009b813288..0256067933 100644
--- a/public/language/en-GB/groups.json
+++ b/public/language/en-GB/groups.json
@@ -53,8 +53,6 @@
 	"details.hidden_help": "If enabled, this group will not be found in the groups listing, and users will have to be invited manually",
 	"details.delete_group": "Delete Group",
 	"details.private_system_help": "Private groups is disabled at system level, this option does not do anything",
-	"details.autojoin": "Enable Auto-Join",
-	"details.autojoin_help": "Allow any user with access to the group to join without confirmation",
 
 	"event.updated": "Group details have been updated",
 	"event.deleted": "The group \"%1\" has been deleted",
diff --git a/public/src/admin/manage/group.js b/public/src/admin/manage/group.js
index 660bf8f203..792560bf2b 100644
--- a/public/src/admin/manage/group.js
+++ b/public/src/admin/manage/group.js
@@ -83,7 +83,6 @@ define('admin/manage/group', [
 					memberPostCids: $('#memberPostCids').val(),
 					disableJoinRequests: $('#group-disableJoinRequests').is(':checked'),
 					disableLeave: $('#group-disableLeave').is(':checked'),
-					autojoin: $('#group-autojoin').is(':checked'),
 				},
 			}, function (err) {
 				if (err) {
diff --git a/src/groups/create.js b/src/groups/create.js
index cdaaf670e0..9bd56ebc1b 100644
--- a/src/groups/create.js
+++ b/src/groups/create.js
@@ -14,7 +14,6 @@ module.exports = function (Groups) {
 			disableJoinRequests = 1;
 		}
 		const disableLeave = parseInt(data.disableLeave, 10) === 1 ? 1 : 0;
-		const autojoin = parseInt(data.autojoin, 10) === 1 ? 1 : 0;
 		const isHidden = parseInt(data.hidden, 10) === 1;
 
 		Groups.validateGroupName(data.name);
@@ -39,7 +38,6 @@ module.exports = function (Groups) {
 			private: isPrivate ? 1 : 0,
 			disableJoinRequests: disableJoinRequests,
 			disableLeave: disableLeave,
-			autojoin: autojoin,
 		};
 
 		await plugins.hooks.fire('filter:group.create', { group: groupData, data: data });
diff --git a/src/groups/data.js b/src/groups/data.js
index 870a424c8e..ae518c27ca 100644
--- a/src/groups/data.js
+++ b/src/groups/data.js
@@ -10,7 +10,7 @@ const translator = require('../translator');
 
 const intFields = [
 	'createtime', 'memberCount', 'hidden', 'system', 'private',
-	'userTitleEnabled', 'disableJoinRequests', 'disableLeave', 'autojoin',
+	'userTitleEnabled', 'disableJoinRequests', 'disableLeave',
 ];
 
 module.exports = function (Groups) {
diff --git a/src/groups/invite.js b/src/groups/invite.js
index ce364435d0..ad17a36ecf 100644
--- a/src/groups/invite.js
+++ b/src/groups/invite.js
@@ -67,12 +67,11 @@ module.exports = function (Groups) {
 	async function inviteOrRequestMembership(groupName, uids, type) {
 		uids = Array.isArray(uids) ? uids : [uids];
 		uids = uids.filter(uid => parseInt(uid, 10) > 0);
-		const [exists, isMember, isPending, isInvited, canAutojoin] = await Promise.all([
+		const [exists, isMember, isPending, isInvited] = await Promise.all([
 			Groups.exists(groupName),
 			Groups.isMembers(uids, groupName),
 			Groups.isPending(uids, groupName),
 			Groups.isInvited(uids, groupName),
-			Groups.getGroupField(groupName, 'autojoin'),
 		]);
 
 		if (!exists) {
@@ -81,11 +80,6 @@ module.exports = function (Groups) {
 
 		uids = uids.filter((uid, i) => !isMember[i] && ((type === 'invite' && !isInvited[i]) || (type === 'request' && !isPending[i])));
 
-		if (canAutojoin) {
-			await Promise.all(uids.map(uid => Groups.join([groupName], uid)));
-			return uids;
-		}
-
 		const set = type === 'invite' ? 'group:' + groupName + ':invited' : 'group:' + groupName + ':pending';
 		await db.setAdd(set, uids);
 		const hookName = type === 'invite' ? 'action:group.inviteMember' : 'action:group.requestMembership';
diff --git a/src/groups/update.js b/src/groups/update.js
index 17a843a78b..26d0cdad5c 100644
--- a/src/groups/update.js
+++ b/src/groups/update.js
@@ -55,10 +55,6 @@ module.exports = function (Groups) {
 			payload.disableLeave = values.disableLeave ? '1' : '0';
 		}
 
-		if (values.hasOwnProperty('autojoin')) {
-			payload.autojoin = values.autojoin ? '1' : '0';
-		}
-
 		if (values.hasOwnProperty('name')) {
 			await checkNameChange(groupName, values.name);
 		}
diff --git a/src/views/admin/manage/group.tpl b/src/views/admin/manage/group.tpl
index 2ff2dc6b3a..ed37a7a8cc 100644
--- a/src/views/admin/manage/group.tpl
+++ b/src/views/admin/manage/group.tpl
@@ -95,18 +95,6 @@
 					</div>
 				</fieldset>
 
-				<fieldset>
-					<div class="checkbox">
-						<label>
-							<input id="group-autojoin" name="hidden" data-property type="checkbox"<!-- IF group.autojoin --> checked<!-- ENDIF group.autojoin -->>
-							<strong>[[admin/manage/groups:edit.autojoin]]</strong>
-							<p class="help-block">
-								[[admin/manage/groups:edit.autojoin-details]]
-							</p>
-						</label>
-					</div>
-				</fieldset>
-
 				<hr />
 
 				<div class="form-group">