diff --git a/app/assets/javascripts/map.js b/app/assets/javascripts/map.js
index d1882cc5e..2154d98cb 100644
--- a/app/assets/javascripts/map.js
+++ b/app/assets/javascripts/map.js
@@ -96,7 +96,11 @@
       }
       if (editable) {
         $(removeMarkerSelector).on("click", removeMarker);
-        map.on("zoomend", updateFormfields);
+        map.on("zoomend", function() {
+          if (marker) {
+            updateFormfields();
+          }
+        });
         map.on("click", moveOrPlaceMarker);
       }
       if (addMarkerInvestments) {