diff --git a/endwork.php b/endwork.php
index a8317bb8..82a21757 100644
--- a/endwork.php
+++ b/endwork.php
@@ -63,7 +63,7 @@ if (ALLOW_OPERATOR_EXTENSION_SELECT && VOIP_ENABLED)
   //unassign extension
   $operator_id = get_operator_id();
 
-  if (get_case_id($operator_id) == false && is_voip_enabled($operator_id))
+  if (get_case_id($operator_id,false) == false && is_voip_enabled($operator_id))
   {
     $sql = "UPDATE `extension`
             SET current_operator_id = NULL
diff --git a/functions/functions.operator.php b/functions/functions.operator.php
index 18c7467f..ef7382f0 100644
--- a/functions/functions.operator.php
+++ b/functions/functions.operator.php
@@ -528,7 +528,7 @@ function get_case_id($operator_id, $create = false)
 		
 		$sq = $db->GetRow($sql);
 
-		if (isset($rnc['next_case_id']) && !empty($rnc['next_case_id']))
+		if ($create && isset($rnc['next_case_id']) && !empty($rnc['next_case_id']))
 		{
 			$case_id = $rnc['next_case_id'];
 
@@ -555,7 +555,7 @@ function get_case_id($operator_id, $create = false)
 			}
 
 		}
-		else if (isset($sq['case_id']) && !empty($sq['case_id']))
+		else if ($create && isset($sq['case_id']) && !empty($sq['case_id']))
 		{
 			$case_id = $sq['case_id'];
 			$case_queue_id = $sq['case_queue_id'];