diff --git a/src/Components/Assets/AssetManage.tsx b/src/Components/Assets/AssetManage.tsx
index 0da432eccb6..77bb88da3a8 100644
--- a/src/Components/Assets/AssetManage.tsx
+++ b/src/Components/Assets/AssetManage.tsx
@@ -498,7 +498,12 @@ const AssetManage = (props: AssetManageProps) => {
       </div>
       {asset?.id &&
         asset?.asset_class &&
-        asset?.asset_class != AssetClass.NONE && <Uptime assetId={asset?.id} />}
+        asset?.asset_class != AssetClass.NONE && (
+          <Uptime
+            route={routes.listAssetAvailability}
+            params={{ external_id: asset.id }}
+          />
+        )}
       <div className="mb-4 mt-8 text-xl font-semibold">Service History</div>
       <div
         className="min-w-full overflow-hidden overflow-x-auto align-middle shadow sm:rounded-lg"
diff --git a/src/Components/Assets/AssetTypes.tsx b/src/Components/Assets/AssetTypes.tsx
index 6186f3c4ee9..39fff240efb 100644
--- a/src/Components/Assets/AssetTypes.tsx
+++ b/src/Components/Assets/AssetTypes.tsx
@@ -113,16 +113,11 @@ export interface AssetsResponse {
   results: AssetData[];
 }
 
-export interface AssetUptimeRecord {
-  id: string;
-  asset: {
-    id: string;
-    name: string;
-  };
+export interface AvailabilityRecord {
+  linked_id: string;
+  linked_model: string;
   status: string;
   timestamp: string;
-  created_date: string;
-  modified_date: string;
 }
 
 export interface AssetTransaction {
diff --git a/src/Components/Common/Uptime.tsx b/src/Components/Common/Uptime.tsx
index e3c7dd7a439..e7272e2e1f4 100644
--- a/src/Components/Common/Uptime.tsx
+++ b/src/Components/Common/Uptime.tsx
@@ -1,10 +1,10 @@
 import { Popover } from "@headlessui/react";
 import { useEffect, useRef, useState } from "react";
-import { AssetStatus, AssetUptimeRecord } from "../Assets/AssetTypes";
+import { AssetStatus, AvailabilityRecord } from "../Assets/AssetTypes";
 import { classNames } from "../../Utils/utils";
 import dayjs from "../../Utils/dayjs";
 import useQuery from "../../Utils/request/useQuery.js";
-import routes from "../../Redux/api.js";
+import { PaginatedResponse, QueryRoute } from "../../Utils/request/types";
 
 const STATUS_COLORS = {
   Operational: "bg-green-500",
@@ -37,7 +37,7 @@ function UptimeInfo({
   records,
   date,
 }: {
-  records: AssetUptimeRecord[];
+  records: AvailabilityRecord[];
   date: string;
 }) {
   const incidents =
@@ -66,7 +66,7 @@ function UptimeInfo({
                     let endTimestamp;
                     let ongoing = false;
 
-                    if (prevIncident?.id) {
+                    if (prevIncident?.linked_id) {
                       endTimestamp = dayjs(prevIncident.timestamp);
                     } else if (dayjs(incident.timestamp).isSame(now, "day")) {
                       endTimestamp = dayjs();
@@ -141,7 +141,7 @@ function UptimeInfoPopover({
   date,
   numDays,
 }: {
-  records: AssetUptimeRecord[];
+  records: AvailabilityRecord[];
   day: number;
   date: string;
   numDays: number;
@@ -165,12 +165,17 @@ function UptimeInfoPopover({
   );
 }
 
-export default function Uptime(props: { assetId: string }) {
+export default function Uptime(
+  props: Readonly<{
+    route: QueryRoute<PaginatedResponse<AvailabilityRecord>>;
+    params?: Record<string, string | number>;
+  }>
+) {
   const [summary, setSummary] = useState<{
-    [key: number]: AssetUptimeRecord[];
+    [key: number]: AvailabilityRecord[];
   }>([]);
-  const { data, loading } = useQuery(routes.listAssetAvailability, {
-    query: { external_id: props.assetId },
+  const { data, loading } = useQuery(props.route, {
+    pathParams: props.params,
     onResponse: ({ data }) => setUptimeRecord(data?.results.reverse() ?? []),
   });
   const availabilityData = data?.results ?? [];
@@ -186,8 +191,8 @@ export default function Uptime(props: { assetId: string }) {
     setNumDays(Math.min(newNumDays, 100));
   };
 
-  const setUptimeRecord = (records: AssetUptimeRecord[]): void => {
-    const recordsByDayBefore: { [key: number]: AssetUptimeRecord[] } = {};
+  const setUptimeRecord = (records: AvailabilityRecord[]): void => {
+    const recordsByDayBefore: { [key: number]: AvailabilityRecord[] } = {};
 
     records.forEach((record) => {
       const timestamp = dayjs(record.timestamp).startOf("day");
@@ -207,10 +212,8 @@ export default function Uptime(props: { assetId: string }) {
         recordsByDayBefore[i] = [];
         if (statusToCarryOver) {
           recordsByDayBefore[i].push({
-            id: "",
-            asset: { id: "", name: "" },
-            created_date: "",
-            modified_date: "",
+            linked_id: "",
+            linked_model: "",
             status: statusToCarryOver,
             timestamp: dayjs()
               .subtract(i, "days")
@@ -225,10 +228,8 @@ export default function Uptime(props: { assetId: string }) {
           ).length === 0
         ) {
           recordsByDayBefore[i].unshift({
-            id: "",
-            asset: { id: "", name: "" },
-            created_date: "",
-            modified_date: "",
+            linked_id: "",
+            linked_model: "",
             status: statusToCarryOver,
             timestamp: dayjs()
               .subtract(i, "days")
@@ -284,7 +285,7 @@ export default function Uptime(props: { assetId: string }) {
       const statusColors: (typeof STATUS_COLORS)[keyof typeof STATUS_COLORS][] =
         [];
       let dayUptimeScore = 0;
-      const recordsInPeriodCache: { [key: number]: AssetUptimeRecord[] } = {};
+      const recordsInPeriodCache: { [key: number]: AvailabilityRecord[] } = {};
       for (let i = 0; i < 3; i++) {
         const start = i * 8;
         const end = (i + 1) * 8;
diff --git a/src/Redux/api.tsx b/src/Redux/api.tsx
index eed17ad3b4b..40c842adc07 100644
--- a/src/Redux/api.tsx
+++ b/src/Redux/api.tsx
@@ -27,7 +27,7 @@ import {
   AssetService,
   AssetServiceUpdate,
   AssetTransaction,
-  AssetUptimeRecord,
+  AvailabilityRecord,
   PatientAssetBed,
 } from "../Components/Assets/AssetTypes";
 import {
@@ -371,6 +371,11 @@ const routes = {
     path: "/api/v1/facility/{facility_external_id}/asset_location/{external_id}/",
     method: "PATCH",
   },
+  getFacilityAssetLocationAvailability: {
+    path: "/api/v1/facility/{facility_external_id}/asset_location/{external_id}/availability/",
+    method: "GET",
+    TRes: Type<PaginatedResponse<AvailabilityRecord>>(),
+  },
 
   // Asset bed
   listAssetBeds: {
@@ -1116,6 +1121,11 @@ const routes = {
     TRes: Type<AssetData>(),
     TBody: Type<Partial<AssetData>>(),
   },
+  listAssetAvailability: {
+    path: "/api/v1/asset/{external_id}/availability/",
+    method: "GET",
+    TRes: Type<PaginatedResponse<AvailabilityRecord>>(),
+  },
 
   // Asset transaction endpoints
 
@@ -1290,19 +1300,6 @@ const routes = {
     },
   },
 
-  // Asset Availability endpoints
-
-  listAssetAvailability: {
-    path: "/api/v1/asset_availability/",
-    method: "GET",
-    TRes: Type<PaginatedResponse<AssetUptimeRecord>>(),
-  },
-  getAssetAvailability: {
-    path: "/api/v1/asset_availability/{id}",
-    method: "GET",
-    TRes: Type<AssetUptimeRecord>(),
-  },
-
   // Prescription endpoints
 
   listPrescriptions: {