diff --git a/lib/modules/asset_tracking/asset_tracking_item_view.dart b/lib/modules/asset_tracking/asset_tracking_item_view.dart
index 3a502427..daece060 100644
--- a/lib/modules/asset_tracking/asset_tracking_item_view.dart
+++ b/lib/modules/asset_tracking/asset_tracking_item_view.dart
@@ -24,7 +24,7 @@ class AssetTrackingListItemView extends StatelessWidget {
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         StatusLabel(
-          label: (asset.location?.isLive ?? false) ? "Live" : "Not Live",
+          label: (asset.location?.isLive ?? false) ? "Active" : "Offline",
           radius: 4,
           textColor: AppColor.getPriorityStatusTextColor(context, (asset.location?.isLive ?? false) ? 0 : 1),
           backgroundColor: AppColor.getPriorityStatusColor(context, (asset.location?.isLive ?? false) ? 0 : 1),
diff --git a/lib/modules/asset_tracking/map_tracking_page.dart b/lib/modules/asset_tracking/map_tracking_page.dart
index 59ce2742..d80a98be 100644
--- a/lib/modules/asset_tracking/map_tracking_page.dart
+++ b/lib/modules/asset_tracking/map_tracking_page.dart
@@ -109,7 +109,8 @@ class _MapTrackingPageState extends State<MapTrackingPage> {
     super.initState();
     inAppView = widget.assetTrackingData == null;
     assetTrackingProvider = Provider.of<AssetTrackingProvider>(context, listen: false);
-    assetTrackingProvider.reset();
+
+    if (inAppView) assetTrackingProvider.reset();
     WidgetsBinding.instance.addPostFrameCallback((_) {
       if (!inAppView) {
         getFloorMap(widget.assetTrackingData!.location!.floor!.id!);