diff --git a/src/Countries.jsx b/src/Countries.jsx
index 0d5ed19..1b0118c 100644
--- a/src/Countries.jsx
+++ b/src/Countries.jsx
@@ -627,11 +627,10 @@ export default function Countries({ mapOptions, onMapOptionClick }) {
                     onMouseLeave={handleMouseLeave}
                   >
 
-                    {popupInfo && <Popup
+                    {open && <Popup
                       longitude={popupInfo.lon}
                       latitude={popupInfo.lat}
                       closeButton={false}
-                      onClose={() => setPopupInfo(null)}
                     >
                       {popupInfo.country_russian_name}
                     </Popup>}
diff --git a/src/Points.jsx b/src/Points.jsx
index 93f9c52..4514d60 100644
--- a/src/Points.jsx
+++ b/src/Points.jsx
@@ -1109,11 +1109,10 @@ export default function Points({ mapOptions, onMapOptionClick }) {
                     onMouseLeave={handleMouseLeave}
                   >
 
-                    {popupInfo && <Popup
+                    {open && <Popup
                       longitude={popupInfo.lon}
                       latitude={popupInfo.lat}
                       closeButton={false}
-                      onClose={() => setPopupInfo(null)}
                     >
                       <h3>{popupInfo.res_name_parc}</h3>
                       {popupInfo.region_name}
diff --git a/src/Regions.jsx b/src/Regions.jsx
index f2285f7..494c9eb 100644
--- a/src/Regions.jsx
+++ b/src/Regions.jsx
@@ -684,11 +684,10 @@ export default function Regions({ mapOptions, onMapOptionClick }) {
                     onMouseLeave={handleMouseLeave}
                   >
 
-                    {popupInfo && <Popup
+                    {open && <Popup
                       longitude={popupInfo.lon}
                       latitude={popupInfo.lat}
                       closeButton={false}
-                      onClose={() => setPopupInfo(null)}
                     >
                       {popupInfo.region_name}
                     </Popup>}