diff --git a/rustfs/src/app/admin_usecase.rs b/rustfs/src/app/admin_usecase.rs
index 770370e5e..a24d21f0a 100644
--- a/rustfs/src/app/admin_usecase.rs
+++ b/rustfs/src/app/admin_usecase.rs
@@ -98,10 +98,7 @@ impl DefaultAdminUsecase {
     }
 
     fn endpoints(&self) -> Option<EndpointServerPools> {
-        self.context
-            .as_ref()
-            .and_then(|context| context.endpoints().handle())
-            .or_else(|| rustfs_ecstore::GLOBAL_Endpoints.get().cloned())
+        self.context.as_ref().and_then(|context| context.endpoints().handle())
     }
 
     fn app_error(code: S3ErrorCode, message: impl Into<String>) -> ApiError {
diff --git a/rustfs/src/app/object_usecase.rs b/rustfs/src/app/object_usecase.rs
index 59de9ae90..62c7708e8 100644
--- a/rustfs/src/app/object_usecase.rs
+++ b/rustfs/src/app/object_usecase.rs
@@ -201,10 +201,7 @@ impl DefaultObjectUsecase {
     }
 
     fn bucket_metadata_sys(&self) -> Option<Arc<RwLock<metadata_sys::BucketMetadataSys>>> {
-        self.context
-            .as_ref()
-            .and_then(|context| context.bucket_metadata().handle())
-            .or_else(|| rustfs_ecstore::bucket::metadata_sys::GLOBAL_BucketMetadataSys.get().cloned())
+        self.context.as_ref().and_then(|context| context.bucket_metadata().handle())
     }
 
     #[instrument(level = "debug", skip(self, fs, req))]