diff --git a/Lab.Server/src/main/java/me/zinch/Lab7/Server/wrapper/ProductCollection.java b/Lab.Server/src/main/java/me/zinch/Lab7/Server/wrapper/ProductCollection.java
index 43dfcae..d37418a 100644
--- a/Lab.Server/src/main/java/me/zinch/Lab7/Server/wrapper/ProductCollection.java
+++ b/Lab.Server/src/main/java/me/zinch/Lab7/Server/wrapper/ProductCollection.java
@@ -28,8 +28,8 @@ import java.util.concurrent.locks.Lock;
 
 public class ProductCollection implements IStorage {
   private static final Logger log = LoggerFactory.getLogger(ProductCollection.class);
-  private TreeSet<Product> productList;
-  private Map<Long, String> productsOwners;
+  private final TreeSet<Product> productList;
+  private final Map<Long, String> productsOwners;
   private final Lock lock = new ReentrantLock();
 
   private List<Product> fetchProducts(Connection connection) {
@@ -84,6 +84,7 @@ public class ProductCollection implements IStorage {
     try {
       var product = DbWrapper.addProduct(productDTO, DbController.getConnection(), user);
       productList.add(product);
+      productsOwners.put(product.getId(), user.getLogin());
       return product;
     } finally {
       lock.unlock();
@@ -107,6 +108,7 @@ public class ProductCollection implements IStorage {
       var product = getProductById(id);
       if (DbWrapper.removeProductById(id, DbController.getConnection(), user)) {
         productList.remove(product);
+        productsOwners.remove(product.getId());
         return product;
       }
       return null;