diff --git a/src/Components/Assets/AssetManage.tsx b/src/Components/Assets/AssetManage.tsx
index b7197dd0562..661043ba697 100644
--- a/src/Components/Assets/AssetManage.tsx
+++ b/src/Components/Assets/AssetManage.tsx
@@ -503,6 +503,10 @@ const AssetManage = (props: AssetManageProps) => {
           <Uptime
             route={routes.listAssetAvailability}
             params={{ external_id: asset.id }}
+            header={
+              <div className="text-xl font-semibold">Availability History</div>
+            }
+            parentClassNames="mt-8 flex w-full flex-col bg-white p-4 shadow-sm sm:rounded-lg"
           />
         )}
       <div className="mb-4 mt-8 text-xl font-semibold">Service History</div>
diff --git a/src/Components/Common/Uptime.tsx b/src/Components/Common/Uptime.tsx
index e7272e2e1f4..4b12a13bd17 100644
--- a/src/Components/Common/Uptime.tsx
+++ b/src/Components/Common/Uptime.tsx
@@ -169,6 +169,9 @@ export default function Uptime(
   props: Readonly<{
     route: QueryRoute<PaginatedResponse<AvailabilityRecord>>;
     params?: Record<string, string | number>;
+    header?: React.ReactNode;
+    parentClassNames?: string;
+    centerInfoPanel?: boolean;
   }>
 ) {
   const [summary, setSummary] = useState<{
@@ -191,6 +194,8 @@ export default function Uptime(
     setNumDays(Math.min(newNumDays, 100));
   };
 
+  const centerInfoPanel = props.centerInfoPanel ?? false;
+
   const setUptimeRecord = (records: AvailabilityRecord[]): void => {
     const recordsByDayBefore: { [key: number]: AvailabilityRecord[] } = {};
 
@@ -361,10 +366,10 @@ export default function Uptime(
     );
   } else if (summary) {
     return (
-      <div className="mt-8 flex w-full flex-col bg-white p-4 shadow-sm sm:rounded-lg">
-        <div className="mx-2 w-full">
+      <div className={props.parentClassNames}>
+        <div className="w-full">
           <div className="grid grid-cols-1">
-            <div className="text-xl font-semibold">Availability History</div>
+            {props.header}
             <div>
               <div className="mt-2 overflow-x-clip px-5">
                 <div className="mb-1 mt-2 flex justify-center text-xs text-gray-700 opacity-70">
@@ -407,15 +412,13 @@ export default function Uptime(
                             }`}
                           ></div>
                         </span>
-                        {hoveredDay === index && (
-                          <>
-                            <UptimeInfoPopover
-                              records={summary[index]}
-                              day={index}
-                              date={formatDateBeforeDays[index]}
-                              numDays={numDays}
-                            />
-                          </>
+                        {hoveredDay === index && !centerInfoPanel && (
+                          <UptimeInfoPopover
+                            records={summary[index]}
+                            day={index}
+                            date={formatDateBeforeDays[index]}
+                            numDays={numDays}
+                          />
                         )}
                       </>
                     );
@@ -432,7 +435,7 @@ export default function Uptime(
               </div>
             </div>
             {hoveredDay !== -1 && (
-              <div className="relative sm:hidden">
+              <div className={`relative ${!centerInfoPanel && "sm:hidden"}`}>
                 <UptimeInfo
                   records={summary[hoveredDay]}
                   date={formatDateBeforeDays[hoveredDay]}
diff --git a/src/Components/Facility/LocationManagement.tsx b/src/Components/Facility/LocationManagement.tsx
index 985d6a029fe..c6578958ac5 100644
--- a/src/Components/Facility/LocationManagement.tsx
+++ b/src/Components/Facility/LocationManagement.tsx
@@ -11,6 +11,7 @@ import request from "../../Utils/request/request";
 import * as Notification from "../../Utils/Notifications.js";
 import ConfirmDialog from "../Common/ConfirmDialog";
 import DialogModal from "../Common/Dialog";
+import Uptime from "../Common/Uptime";
 
 const Loading = lazy(() => import("../Common/Loading"));
 
@@ -19,6 +20,7 @@ interface Props {
 }
 
 interface LocationProps extends LocationModel {
+  facilityId: string;
   setShowDeletePopup: (e: { open: boolean; name: string; id: string }) => void;
 }
 
@@ -109,7 +111,11 @@ export default function LocationManagement({ facilityId }: Props) {
             </PaginatedList.WhenLoading>
             <PaginatedList.Items<LocationModel> className="my-8 grid gap-3 @4xl:grid-cols-2 @6xl:grid-cols-3 @[100rem]:grid-cols-4 lg:mx-8">
               {(item) => (
-                <Location setShowDeletePopup={setShowDeletePopup} {...item} />
+                <Location
+                  setShowDeletePopup={setShowDeletePopup}
+                  facilityId={facilityId}
+                  {...item}
+                />
               )}
             </PaginatedList.Items>
           </div>
@@ -208,6 +214,7 @@ const Location = ({
   modified_date,
   id,
   setShowDeletePopup,
+  facilityId,
 }: LocationProps) => (
   <div className="flex h-full w-full flex-col rounded border border-gray-300 bg-white p-6 shadow-sm transition-all duration-200 ease-in-out hover:border-primary-400">
     <div className="flex-1">
@@ -241,6 +248,16 @@ const Location = ({
       >
         {middleware_address || "-"}
       </p>
+      <Uptime
+        route={routes.listFacilityAssetLocationAvailability}
+        params={{ external_id: id, facility_external_id: facilityId }}
+        header={
+          <p className="mt-3 text-sm font-semibold text-gray-700">
+            Middleware Uptime
+          </p>
+        }
+        centerInfoPanel
+      />
     </div>
 
     <ButtonV2
diff --git a/src/Redux/api.tsx b/src/Redux/api.tsx
index 35a878adabc..3bed047a4fe 100644
--- a/src/Redux/api.tsx
+++ b/src/Redux/api.tsx
@@ -386,7 +386,7 @@ const routes = {
     method: "DELETE",
     TRes: Type<Record<string, never>>(),
   },
-  getFacilityAssetLocationAvailability: {
+  listFacilityAssetLocationAvailability: {
     path: "/api/v1/facility/{facility_external_id}/asset_location/{external_id}/availability/",
     method: "GET",
     TRes: Type<PaginatedResponse<AvailabilityRecord>>(),