diff --git a/app/call_centers/call_center_agent_edit.php b/app/call_centers/call_center_agent_edit.php
index 8ffdf43f43..9b1eb0b71d 100644
--- a/app/call_centers/call_center_agent_edit.php
+++ b/app/call_centers/call_center_agent_edit.php
@@ -228,6 +228,15 @@
 					$cmd = "callcenter_config agent set status ".$call_center_agent_uuid." '".$agent_status."'";
 					$response = event_socket::api($cmd);
 					usleep(200);
+				//agent set state
+					if (in_array($agent_status, array('Available', 'Available (On Demand)'))) {
+						$agent_state = 'Waiting';
+					} else {
+						$agent_state = 'Idle';
+					}
+					$cmd = "api callcenter_config agent set state ".$call_center_agent_uuid." '".$agent_state."'";
+					$response = event_socket_request($fp, $cmd);
+					usleep(200);
 				//agent set reject_delay_time
 					$cmd = 'callcenter_config agent set reject_delay_time '.$call_center_agent_uuid.' '. $agent_reject_delay_time;
 					$response = event_socket::api($cmd);
diff --git a/app/call_centers/call_center_agent_status.php b/app/call_centers/call_center_agent_status.php
index 4491f93de5..052ab72601 100644
--- a/app/call_centers/call_center_agent_status.php
+++ b/app/call_centers/call_center_agent_status.php
@@ -232,6 +232,19 @@
 							}
 							//echo $command."\n";
 
+						//set the call center agent state
+							$command = '';
+							if (!isset($row['queue_name'])) {
+								if (in_array($agent_status, array('Available', 'Available (On Demand)'))) {
+									$agent_state = 'Waiting';
+								} else {
+									$agent_state = 'Idle';
+								}
+								$command = "api callcenter_config agent set state ".$row['agent_uuid']." '".$agent_state."'";
+								$response = event_socket_request($fp, $command);
+							}
+							//echo $command."\n";
+
 						//get the queue_id
 							if (isset($row['queue_uuid']) && is_uuid($row['queue_uuid'])) {
 								if (!empty($call_center_queues)) {