diff --git a/SQF/dayz_code/compile/player_death.sqf b/SQF/dayz_code/compile/player_death.sqf
index ddbac6da7..523268a9a 100644
--- a/SQF/dayz_code/compile/player_death.sqf
+++ b/SQF/dayz_code/compile/player_death.sqf
@@ -150,7 +150,7 @@ _myGroup = group _body;
 [_body] joinSilent dayz_firstGroup;
 deleteGroup _myGroup;
 
-80000 cutText ["","PLAIN"]; //Clear group icons
+80000 cutText ["","PLAIN"]; //Clear group tags
 3 cutRsc ["default", "PLAIN",3];
 4 cutRsc ["default", "PLAIN",3];
 
diff --git a/SQF/dayz_code/groups/disband.sqf b/SQF/dayz_code/groups/disband.sqf
index db6c53cfb..dbc704201 100644
--- a/SQF/dayz_code/groups/disband.sqf
+++ b/SQF/dayz_code/groups/disband.sqf
@@ -13,4 +13,7 @@ dayz_groupDisbandThread = _group spawn {
 	
 	{[_x] joinSilent grpNull} count (units _this);
 	deleteGroup _this;
+	
+	terminate dayz_groupTags;
+	80000 cutText ["","PLAIN"];
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/groups/groupTags.sqf b/SQF/dayz_code/groups/groupTags.sqf
index 4964674cb..16a0c819b 100644
--- a/SQF/dayz_code/groups/groupTags.sqf
+++ b/SQF/dayz_code/groups/groupTags.sqf
@@ -3,7 +3,7 @@ private ["_display","_distance","_group","_icon","_index","_pos","_scale","_scre
 while {true} do {
 	_group = player call dayz_filterGroup;
 	
-	if (!visibleMap && count _group > 1 && cameraView in ["INTERNAL","EXTERNAL","GUNNER"]) then {
+	if (!visibleMap && count _group > 1) then { //Use (&& cameraView != "GROUP") if tactical view is allowed (blocked by default)
 		80000 cutRsc ["DZ_GroupTags","PLAIN"];
 		
 		_display = uiNamespace getVariable "DZ_GroupTags";
diff --git a/SQF/dayz_code/groups/init.sqf b/SQF/dayz_code/groups/init.sqf
index 813a45bf5..0ba4e7f73 100644
--- a/SQF/dayz_code/groups/init.sqf
+++ b/SQF/dayz_code/groups/init.sqf
@@ -41,7 +41,9 @@ dayz_promotePlayer = compile preprocessFileLineNumbers "\z\addons\dayz_code\grou
 dayz_rejectGroup = compile preprocessFileLineNumbers "\z\addons\dayz_code\groups\reject.sqf";
 dayz_groupInit = true;
 
-execVM "\z\addons\dayz_code\groups\groupTags.sqf";
+if (count (units group player) > 1) then {
+	dayz_groupTags = execVM "\z\addons\dayz_code\groups\groupTags.sqf";
+};
 
 if (dayz_requireRadio or {dayz_markGroup > 0} or {dayz_markSelf > 0} or {dayz_markBody > 0}) then {
 	execVM "\z\addons\dayz_code\groups\groupMarkers.sqf";
diff --git a/SQF/dayz_code/groups/join.sqf b/SQF/dayz_code/groups/join.sqf
index c173bf916..f87f509da 100644
--- a/SQF/dayz_code/groups/join.sqf
+++ b/SQF/dayz_code/groups/join.sqf
@@ -27,6 +27,10 @@ if (!isNull _inviter) then {
 	_oldGroup = group player;
 	[player] joinSilent (group _inviter);
 	if (count (units _oldGroup) == 0) then {deleteGroup _oldGroup;};
+	
+	if (isNil "dayz_groupTags" or {scriptDone "dayz_groupTags"}) then {
+		dayz_groupTags = execVM "\z\addons\dayz_code\groups\groupTags.sqf";
+	};
 
 	// Update saved group in DB
 	PVDZ_Server_UpdateGroup = [1,player];
diff --git a/SQF/dayz_code/groups/leave.sqf b/SQF/dayz_code/groups/leave.sqf
index 8f2a07d3d..2bad5847a 100644
--- a/SQF/dayz_code/groups/leave.sqf
+++ b/SQF/dayz_code/groups/leave.sqf
@@ -11,4 +11,7 @@ dayz_groupLeaveThread = [] spawn {
 	//Wait for response from server to confirm group finished updating in DB
 	waitUntil {!isNil "dayz_groupLeft"};	
 	[player] joinSilent grpNull;
+	
+	terminate dayz_groupTags;
+	80000 cutText ["","PLAIN"];
 };
\ No newline at end of file