diff --git a/Assets/Cryville.EEW.Unity/Worker.cs b/Assets/Cryville.EEW.Unity/Worker.cs
index 9fdf02d..104b68e 100644
--- a/Assets/Cryville.EEW.Unity/Worker.cs
+++ b/Assets/Cryville.EEW.Unity/Worker.cs
@@ -206,8 +206,9 @@ namespace Cryville.EEW.Unity {
 			m_cameraController.OnMapElementUpdated();
 		}
 		public void SetCurrent(ReportViewModel e) {
-			m_mapElementManager.SetCurrent(e);
-			m_cameraController.OnMapElementUpdated();
+			if (m_mapElementManager.SetCurrent(e)) {
+				m_cameraController.OnMapElementUpdated();
+			}
 		}
 
 		void Update() {