diff --git a/app/basic_operator_panel/app_config.php b/app/basic_operator_panel/app_config.php
index ab1473f8ab..39cd6bf82a 100644
--- a/app/basic_operator_panel/app_config.php
+++ b/app/basic_operator_panel/app_config.php
@@ -67,5 +67,13 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the refresh rate in seconds (<=120) or milliseconds (>=500).";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "0c273cad-1ee4-48d9-9336-08bc8260579a";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "operator_panel";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "group_extensions";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set if extensions are grouped by call_group when viewing all extensions.";
+		$y++;
 
 ?>
\ No newline at end of file
diff --git a/app/basic_operator_panel/resources/content.php b/app/basic_operator_panel/resources/content.php
index 1fe82ce8c8..ae123ba9ba 100644
--- a/app/basic_operator_panel/resources/content.php
+++ b/app/basic_operator_panel/resources/content.php
@@ -458,7 +458,7 @@ if (is_array($activity)) foreach ($activity as $extension => $ext) {
 
 	if (in_array($extension, $_SESSION['user']['extensions'])) {
 		$user_extensions[] = $block;
-	} elseif (!empty($ext['call_group'])) {
+	} elseif (!empty($ext['call_group']) && filter_var($_SESSION['operator_panel']['group_extensions']['boolean'], FILTER_VALIDATE_BOOLEAN)) {
 		$grouped_extensions[$ext['call_group']][] = $block;
 	} else {
 		$other_extensions[] = $block;