diff --git a/tools/citrineos-core-main/apps/operator-ui/src/lib/client/pages/charging-stations/detail/charging.station.detail.card.tsx b/tools/citrineos-core-main/apps/operator-ui/src/lib/client/pages/charging-stations/detail/charging.station.detail.card.tsx
index 049b430..b8e631a 100644
--- a/tools/citrineos-core-main/apps/operator-ui/src/lib/client/pages/charging-stations/detail/charging.station.detail.card.tsx
+++ b/tools/citrineos-core-main/apps/operator-ui/src/lib/client/pages/charging-stations/detail/charging.station.detail.card.tsx
@@ -77,7 +77,7 @@ export const ChargingStationDetailCard = ({
     queryOptions: getPlainToInstanceOptions(ChargingStationClass, true),
   });
 
-  const station = data?.data;
+  const station = Array.isArray(data?.data) ? data?.data?.[0] : data?.data;
 
   const {
     query: { data: latestLogsData },
diff --git a/tools/citrineos-core-main/apps/operator-ui/src/lib/queries/charging.stations.ts b/tools/citrineos-core-main/apps/operator-ui/src/lib/queries/charging.stations.ts
index 5e77fbe..25a200c 100644
--- a/tools/citrineos-core-main/apps/operator-ui/src/lib/queries/charging.stations.ts
+++ b/tools/citrineos-core-main/apps/operator-ui/src/lib/queries/charging.stations.ts
@@ -193,8 +193,8 @@ export const CHARGING_STATIONS_STATUS_COUNT_QUERY = gql`
 `;
 
 export const CHARGING_STATIONS_GET_QUERY = gql`
-  query GetChargingStationById($id: Int!) {
-    ChargingStations_by_pk(id: $id) {
+  query GetChargingStationById($id: String!) {
+    chargingStations(where: {id: {_eq: $id}}) {
       id
       tenantId
       ocppConnectionName