diff --git a/tools/citrineos-core-main/apps/operator-ui/src/app/(authenticated)/charging-stations/[id]/actions.ts b/tools/citrineos-core-main/apps/operator-ui/src/app/(authenticated)/charging-stations/[id]/actions.ts
new file mode 100644
index 0000000..dfe099f
--- /dev/null
+++ b/tools/citrineos-core-main/apps/operator-ui/src/app/(authenticated)/charging-stations/[id]/actions.ts
@@ -0,0 +1,17 @@
+// SPDX-FileCopyrightText: 2025 Contributors to the CitrineOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+'use server';
+
+import { cookies } from 'next/headers';
+
+export async function setStationCookie(stationId: string, stationData: any) {
+  const cookieStore = await cookies();
+  cookieStore.set('station-data', JSON.stringify(stationData || null), {
+    httpOnly: false,
+    secure: false,
+    sameSite: 'lax',
+    maxAge: 60,
+    path: `/charging-stations/${stationId}`,
+  });
+}
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 ea210db..33869e4 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($where: ChargingStations_bool_exp!) {
-    ChargingStations(where: $where, limit: 1) {
+  query GetChargingStationById($id: String!) {
+    ChargingStations(where: {id: {_eq: $id}}, limit: 1) {
       id
       tenantId
       ocppConnectionName