diff --git a/src/components/Map/MapViewer/utils/config/pinsLayer/getBioEntitiesFeatures.ts b/src/components/Map/MapViewer/utils/config/pinsLayer/getBioEntitiesFeatures.ts
index abe9ebba76663c17a10cf6a63e6fa1394e5d5906..f45b6ea6a613880d52c1e155924bdb49f7e410cd 100644
--- a/src/components/Map/MapViewer/utils/config/pinsLayer/getBioEntitiesFeatures.ts
+++ b/src/components/Map/MapViewer/utils/config/pinsLayer/getBioEntitiesFeatures.ts
@@ -1,4 +1,3 @@
-import { ZERO } from '@/constants/common';
 import { EntityNumber } from '@/redux/entityNumber/entityNumber.types';
 import { BioEntity } from '@/types/models';
 import { PinType } from '@/types/pin';
@@ -23,7 +22,7 @@ export const getBioEntitiesFeatures = (
       pointToProjection,
       type,
       // pin's index number
-      value: entityNumber?.[bioEntity.elementId] || ZERO,
+      value: entityNumber?.[bioEntity.elementId],
     }),
   );
 };
diff --git a/src/components/Map/MapViewer/utils/listeners/mapSingleClick/handleDataReset.test.ts b/src/components/Map/MapViewer/utils/listeners/mapSingleClick/handleDataReset.test.ts
index bb5cd7f87d05025a2a4336fd242e1b4b64cfaa08..904522c2251dc6d5e75fb7adbec882e58029c6b8 100644
--- a/src/components/Map/MapViewer/utils/listeners/mapSingleClick/handleDataReset.test.ts
+++ b/src/components/Map/MapViewer/utils/listeners/mapSingleClick/handleDataReset.test.ts
@@ -15,6 +15,7 @@ describe('handleDataReset', () => {
       'drugs/clearDrugsData',
       'chemicals/clearChemicalsData',
       'contextMenu/closeContextMenu',
+      'entityNumber/clearEntityNumberData',
     ];
 
     expect(actions.map(a => a.type)).toStrictEqual(actionsTypes);
diff --git a/src/components/Map/MapViewer/utils/listeners/mapSingleClick/handleDataReset.ts b/src/components/Map/MapViewer/utils/listeners/mapSingleClick/handleDataReset.ts
index 3f4afbc730371e6d9218f419ea98b3d91cc1657e..f3b7e3b47d8c4d2ff9dcd30f5465a1d457c234f6 100644
--- a/src/components/Map/MapViewer/utils/listeners/mapSingleClick/handleDataReset.ts
+++ b/src/components/Map/MapViewer/utils/listeners/mapSingleClick/handleDataReset.ts
@@ -1,6 +1,7 @@
 import { clearChemicalsData } from '@/redux/chemicals/chemicals.slice';
 import { closeContextMenu } from '@/redux/contextMenu/contextMenu.slice';
 import { clearDrugsData } from '@/redux/drugs/drugs.slice';
+import { clearEntityNumberData } from '@/redux/entityNumber/entityNumber.slice';
 import { resetReactionsData } from '@/redux/reactions/reactions.slice';
 import { clearSearchData } from '@/redux/search/search.slice';
 import { AppDispatch } from '@/redux/store';
@@ -16,4 +17,5 @@ export const handleDataReset = (dispatch: AppDispatch): void => {
   dispatch(clearDrugsData());
   dispatch(clearChemicalsData());
   dispatch(closeContextMenu());
+  dispatch(clearEntityNumberData());
 };
diff --git a/src/redux/entityNumber/entityNumber.selectors.ts b/src/redux/entityNumber/entityNumber.selectors.ts
index 5f46877136d91d7281e6b91d99483eda39ce2ffa..64576d502818bba454ea65edc2a29707f07610f8 100644
--- a/src/redux/entityNumber/entityNumber.selectors.ts
+++ b/src/redux/entityNumber/entityNumber.selectors.ts
@@ -10,5 +10,5 @@ export const entityNumberDataSelector = createSelector(
 
 export const numberByEntityNumberIdSelector = createSelector(
   [entityNumberDataSelector, (_state, id: string): string => id],
-  (entityNumber, id) => entityNumber?.[id],
+  (entityNumber, id): number | undefined => entityNumber?.[id],
 );