diff --git a/app/lib/generic_event_tracker.rb b/app/lib/generic_event_tracker.rb
index d6116f96..e5dde557 100644
--- a/app/lib/generic_event_tracker.rb
+++ b/app/lib/generic_event_tracker.rb
@@ -7,7 +7,7 @@ def self.for_request(request)
       url_params = request.params.slice("client_agency_id", "locale")
       defaults = {
         # Not setting device_id because Mixpanel fixates on that as the distinct_id, which we do not want
-        ip: request.ip,
+        ip: request.remote_ip,
         cbv_flow_id: request.session[:cbv_flow_id],
         client_agency_id: url_params["client_agency_id"],
         locale: url_params["locale"],
diff --git a/app/lib/mixpanel_event_tracker.rb b/app/lib/mixpanel_event_tracker.rb
index be83c98e..c5cb75b5 100644
--- a/app/lib/mixpanel_event_tracker.rb
+++ b/app/lib/mixpanel_event_tracker.rb
@@ -20,7 +20,7 @@ def track(event_type, request, attributes = {})
 
       tracker_attrs =  { cbv_flow_id: flow_id }
       if request.present?
-        tracker_attrs.merge!({ ip: request.ip })
+        tracker_attrs.merge!({ "$ip": request.remote_ip })
       end
 
       @tracker.people.set(distinct_id, tracker_attrs)