diff --git a/tools/citrineos-core-main/apps/operator-ui/src/app/(authenticated)/charging-stations/[id]/page.tsx b/tools/citrineos-core-main/apps/operator-ui/src/app/(authenticated)/charging-stations/[id]/page.tsx
index 567b551..e8322bf 100644
--- a/tools/citrineos-core-main/apps/operator-ui/src/app/(authenticated)/charging-stations/[id]/page.tsx
+++ b/tools/citrineos-core-main/apps/operator-ui/src/app/(authenticated)/charging-stations/[id]/page.tsx
@@ -10,5 +10,5 @@ type PageProps = {
 
 export default async function ShowChargingStationPage({ params }: PageProps) {
   const { id } = await params;
-  return <ChargingStationDetail params={{ id: String(id)} />;
+  return <ChargingStationDetail params={{ id: String(id) }} />;
 }
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 a63b125..ac928ce 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
@@ -90,9 +90,9 @@ export const ChargingStationDetailCard = ({
     sorters: [{ field: OCPPMessageProps.timestamp, order: 'desc' }],
     filters: [
       {
-        field: OCPPMessageProps.ocppConnectionName,
+        field: 'stationId',
         operator: 'eq',
-        value: station?.ocppConnectionName,
+        value: station?.id,
       },
     ],
     pagination: {
diff --git a/tools/citrineos-core-main/apps/operator-ui/src/lib/client/pages/charging-stations/detail/charging.station.detail.tsx b/tools/citrineos-core-main/apps/operator-ui/src/lib/client/pages/charging-stations/detail/charging.station.detail.tsx
index 2dd782e..c0ac17e 100644
--- a/tools/citrineos-core-main/apps/operator-ui/src/lib/client/pages/charging-stations/detail/charging.station.detail.tsx
+++ b/tools/citrineos-core-main/apps/operator-ui/src/lib/client/pages/charging-stations/detail/charging.station.detail.tsx
@@ -16,7 +16,7 @@ import { AccessDeniedFallbackCard } from '@lib/client/components/access-denied-f
 import { Skeleton } from '@lib/client/components/ui/skeleton';
 
 type ChargingStationDetailProps = {
-  params: { id: number };
+  params: { id: string };
 };
 
 export const ChargingStationDetail: React.FC<ChargingStationDetailProps> = ({ params }) => {
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 87dc60b..eabcedd 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
@@ -275,11 +275,9 @@ export const CHARGING_STATIONS_GET_QUERY = gql`
       transactions: transactions(where: { isActive: { _eq: true } }) {
         id
         stationId
-        ocppConnectionName
         timeSpentCharging
         isActive
         chargingState
-        ocppConnectionName
         stoppedReason
         transactionId
         evseId
@@ -290,7 +288,6 @@ export const CHARGING_STATIONS_GET_QUERY = gql`
       }
       connectors: connectors {
         id
-        ocppConnectionName
         stationId
         evseId
         connectorId
@@ -342,7 +339,6 @@ export const GET_CHARGING_STATIONS_WITH_LOCATION_AND_LATEST_STATUS_NOTIFICATIONS
         timeSpentCharging
         isActive
         chargingState
-        ocppConnectionName
         stoppedReason
         transactionId
         evseId