diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php
index b574ad759ecafc06d235177d820fba0aa254fe34..aebabf6ebd0dd5b63b2b7e162e7a1c11cf03b448 100755
--- a/src/app/resource/controllers/ResController.php
+++ b/src/app/resource/controllers/ResController.php
@@ -846,7 +846,7 @@ class ResController extends ResourceControlController
         }
 
         $queryParams = $request->getQueryParams();
-        if ($args['fieldId'] == 'destination' && !empty($queryParams['alt'])) {
+        if ($args['fieldId'] == 'destination' && !empty($queryParams['alt']) && !empty($resource['destination'])) {
             $entity = EntityModel::getByEntityId(['entityId' => $resource['destination'], 'select' => ['id']]);
             $resource['destination'] = $entity['id'];
         }
@@ -1062,6 +1062,9 @@ class ResController extends ResourceControlController
             'data'   => [$GLOBALS['userId']]
         ]);
         $entities = array_column($entities, 'id');
+        if (empty($entities)) {
+            $entities = [0];
+        }
         $idToDelete = FolderModel::getWithEntitiesAndResources([
             'select'    => ['resources_folders.id'],
             'where'     => ['resources_folders.res_id = ?', '(entities_folders.entity_id in (?) OR folders.user_id = ? OR keyword = ?)'],
diff --git a/src/app/resource/controllers/ResourceControlController.php b/src/app/resource/controllers/ResourceControlController.php
index 56c5f9d71ec1642eed29fbd2c0b158628761442f..ceada524ae0e5dc87b9c2d1d562908b237f03489 100644
--- a/src/app/resource/controllers/ResourceControlController.php
+++ b/src/app/resource/controllers/ResourceControlController.php
@@ -176,7 +176,7 @@ class ResourceControlController
             if (empty($entity)) {
                 return ['errors' => "Body initiator does not exist"];
             }
-            if ($body['initiator'] != $entity['entity_id']) {
+            if ($resource['initiator'] != $entity['entity_id']) {
                 $userEntities = UserModel::getEntitiesByLogin(['login' => $GLOBALS['userId']]);
                 $userEntities = array_column($userEntities, 'id');
                 if (!in_array($body['initiator'], $userEntities)) {