diff --git a/super-screen/client/src/sections/community-safty/containers/gis.js b/super-screen/client/src/sections/community-safty/containers/gis.js
index 5cf2e16..797617d 100644
--- a/super-screen/client/src/sections/community-safty/containers/gis.js
+++ b/super-screen/client/src/sections/community-safty/containers/gis.js
@@ -92,7 +92,7 @@ function Map(props) {
     }, [tab, devices]);
 
     useEffect(() => {
-        if (!delay) map && renderDevices()
+        if (!delay) tab == 'device' && map && renderDevices()
     }, [type]);