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 b8e631a..a63b125 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,8 @@ export const ChargingStationDetailCard = ({
     queryOptions: getPlainToInstanceOptions(ChargingStationClass, true),
   });
 
-  const station = Array.isArray(data?.data) ? data?.data?.[0] : data?.data;
+  const stationData = data as any;
+  const station = stationData?.data?.ChargingStations?.[0] || stationData?.data || null;
 
   const {
     query: { data: latestLogsData },