diff --git a/app/assets/javascripts/map.js.coffee b/app/assets/javascripts/map.js.coffee
index e70a65f4c..ef2c27e28 100644
--- a/app/assets/javascripts/map.js.coffee
+++ b/app/assets/javascripts/map.js.coffee
@@ -99,7 +99,7 @@ App.Map =
       for i in addMarkerInvestments
         if App.Map.validCoordinates(i)
           marker = createMarker(i.lat, i.long)
-          marker.options['id'] = i.id
+          marker.options['id'] = i.investment_id
 
           marker.on 'click', openMarkerPopup
 
diff --git a/app/models/map_location.rb b/app/models/map_location.rb
index 590eeb284..f66d71e34 100644
--- a/app/models/map_location.rb
+++ b/app/models/map_location.rb
@@ -11,7 +11,8 @@ class MapLocation < ActiveRecord::Base
 
   def json_data
     {
-      id: id,
+      investment_id: investment_id,
+      proposal_id: proposal_id,
       lat: latitude,
       long: longitude
     }