diff --git a/src/modules/workspace/repositories/workspace.repository.ts b/src/modules/workspace/repositories/workspace.repository.ts
index 5a326ff25..b8900f766 100644
--- a/src/modules/workspace/repositories/workspace.repository.ts
+++ b/src/modules/workspace/repositories/workspace.repository.ts
@@ -121,15 +121,6 @@ export class WorkspaceRepository {
       .collection(Collections.WORKSPACE)
       .findOne({ _id: id });
     // Check if workspace is restricted
-    if (!response) {
-      throw new BadRequestException("Workspace not found.");
-    }
-    if (response?.isRestricted === true || response?.isFreezed === true) {
-      console.log(`Access denied: Workspace ${id} is restricted`);
-      throw new BadRequestException(
-        "This workspace is restricted and cannot be accessed.",
-      );
-    }
     return response;
   }
 
@@ -141,11 +132,11 @@ export class WorkspaceRepository {
       .find({ _id: { $in: IdArray } })
       .toArray();
     if (!response || response.length === 0) {
-      throw new BadRequestException("No workspaces found.");
+      return response;
     }
     // Filter out restricted workspaces
     const filteredResponse = response.filter((workspace) => {
-      if (workspace?.isRestricted === true) {
+      if (workspace?.isRestricted || workspace?.isFreezed) {
         return false;
       }
       return true;