diff --git a/server/controllers/staff/assign-ticket.php b/server/controllers/staff/assign-ticket.php
index a72b6218..77cfd415 100755
--- a/server/controllers/staff/assign-ticket.php
+++ b/server/controllers/staff/assign-ticket.php
@@ -20,7 +20,7 @@ DataValidator::with('CustomValidations', true);
  * @apiUse INVALID_TICKET
  * @apiUse TICKET_ALREADY_ASSIGNED
  * @apiUse INVALID_DEPARTMENT
- * 
+ *
  * @apiSuccess {Object} data Empty object
  *
  */
diff --git a/server/controllers/ticket/change-department.php b/server/controllers/ticket/change-department.php
index 5cea221d..8685b3be 100755
--- a/server/controllers/ticket/change-department.php
+++ b/server/controllers/ticket/change-department.php
@@ -66,11 +66,21 @@ class ChangeDepartmentController extends Controller {
         $ticket->addEvent($event);
         $ticket->department = $department;
         $ticket->unread = true;
-        if(!Controller::getLoggedUser()->sharedDepartmentList->includesId($department->id)) {
-            $ticket->owner = null;
-        }
         $ticket->store();
 
+        if(!Controller::getLoggedUser()->sharedDepartmentList->includesId($department->id)) {
+            Controller::setDataRequester(function ($key) use ($ticketNumber) {
+                if($key === 'ticketNumber') {
+                    return $ticketNumber;
+                }
+
+                return null;
+            });
+            $unAssignTicketController = new UnAssignStaffController();
+            $unAssignTicketController->validate();
+            $unAssignTicketController->handler();
+        }
+
         Log::createLog('DEPARTMENT_CHANGED', $ticket->ticketNumber);
 
         Response::respondSuccess();