diff --git a/client/src/components/contract-cars/contract-cars.container.jsx b/client/src/components/contract-cars/contract-cars.container.jsx
index 12bce1f42..6fb3d080f 100644
--- a/client/src/components/contract-cars/contract-cars.container.jsx
+++ b/client/src/components/contract-cars/contract-cars.container.jsx
@@ -3,9 +3,12 @@ import React from "react";
 import { QUERY_AVAILABLE_CC } from "../../graphql/courtesy-car.queries";
 import AlertComponent from "../alert/alert.component";
 import ContractCarsComponent from "./contract-cars.component";
+import moment from "moment";
 
 export default function ContractCarsContainer({ selectedCarState, form }) {
-  const { loading, error, data } = useQuery(QUERY_AVAILABLE_CC);
+  const { loading, error, data } = useQuery(QUERY_AVAILABLE_CC, {
+    variables: { today: moment().format("YYYY-MM-DD") },
+  });
 
   const [selectedCar, setSelectedCar] = selectedCarState;
 
diff --git a/client/src/graphql/courtesy-car.queries.js b/client/src/graphql/courtesy-car.queries.js
index 816988d16..d7299f21a 100644
--- a/client/src/graphql/courtesy-car.queries.js
+++ b/client/src/graphql/courtesy-car.queries.js
@@ -13,28 +13,24 @@ export const INSERT_NEW_COURTESY_CAR = gql`
 `;
 
 export const QUERY_AVAILABLE_CC = gql`
-  query QUERY_AVAILABLE_CC {
-    courtesycars(
-      where: {
-        serviceenddate: { _is_null: true }
-        status: { _eq: "courtesycars.status.in" }
-      }
-    ) {
-      color
-      dailycost
-      damage
-      fleetnumber
-      fuel
-      id
-      make
-      model
-      plate
-      status
-      year
-      dailycost
-      mileage
-    }
+query QUERY_AVAILABLE_CC($today: date) {
+  courtesycars(where: {_or: [{serviceenddate: {_is_null: true}}, {serviceenddate: {_gt: $today}}], status: {_eq: "courtesycars.status.in"}}) {
+    color
+    dailycost
+    damage
+    fleetnumber
+    fuel
+    id
+    make
+    model
+    plate
+    status
+    year
+    dailycost
+    mileage
   }
+}
+
 `;
 
 export const QUERY_ALL_CC = gql`