diff --git a/initdb/02_5_signalk_api_deps.sql b/initdb/02_5_signalk_api_deps.sql
index f378d6f..051b50d 100644
--- a/initdb/02_5_signalk_api_deps.sql
+++ b/initdb/02_5_signalk_api_deps.sql
@@ -81,10 +81,11 @@ AS $vessel$
 			                    anglespeedapparent,
 			                    longitude,latitude,
 			                    st_makepoint(longitude,latitude) AS geo_point
-			                    FROM public.last_metric
+			                    FROM api.metrics
 			                    WHERE
                                     latitude IS NOT NULL
                                     AND longitude IS NOT NULL
+                                    AND client_id = current_setting('vessel.client_id', false)
 			                )
 			            ) AS t
 	            ) AS geojson_t