diff --git a/db/routines/vn/procedures/collection_assign.sql b/db/routines/vn/procedures/collection_assign.sql
index ba83f1fbb6..c2d4a34ef7 100644
--- a/db/routines/vn/procedures/collection_assign.sql
+++ b/db/routines/vn/procedures/collection_assign.sql
@@ -118,9 +118,19 @@ BEGIN
 	IF vCollectionFk IS NULL THEN
 		CALL collection_new(vUserFk, vCollectionFk);
 
-		UPDATE `collection`
-			SET workerFk = vUserFk
-			WHERE id = vCollectionFk;
+		START TRANSACTION;
+
+		SELECT workerFk INTO vCollectionWorker
+			FROM `collection` 
+			WHERE id = vCollectionFk FOR UPDATE;
+
+		IF vCollectionWorker IS NULL THEN
+			UPDATE `collection`
+				SET workerFk = vUserFk
+				WHERE id = vCollectionFk;
+		END IF;
+
+		COMMIT;
 	END IF;
 END$$
 DELIMITER ;
\ No newline at end of file
diff --git a/front/core/services/app.js b/front/core/services/app.js
index fa129c3fcb..dba6e70bff 100644
--- a/front/core/services/app.js
+++ b/front/core/services/app.js
@@ -66,15 +66,15 @@ export default class App {
             ]}
         };
 
+        const hasId = !isNaN(parseInt(route.split('/')[1]));
+
         if (this.logger.$params.q) {
             let tableValue = this.logger.$params.q;
             const q = JSON.parse(tableValue);
             if (typeof q === 'number')
                 tableValue = JSON.stringify({id: tableValue});
             newRoute = newRoute.concat(`?table=${tableValue}`);
-        }
-
-        if (this.logger.$params.id && newRoute.indexOf(this.logger.$params.id) < 0)
+        } else if (!hasId && this.logger.$params.id && newRoute.indexOf(this.logger.$params.id) < 0)
             newRoute = newRoute.concat(`${this.logger.$params.id}`);
 
         return this.logger.$http.get('Urls/findOne', {filter})