diff --git a/CompanyManagment.App.Contracts/Workshop/WorkshopAccountViewModel.cs b/CompanyManagment.App.Contracts/Workshop/WorkshopAccountViewModel.cs
index 4ae5f0b3..59413e3a 100644
--- a/CompanyManagment.App.Contracts/Workshop/WorkshopAccountViewModel.cs
+++ b/CompanyManagment.App.Contracts/Workshop/WorkshopAccountViewModel.cs
@@ -9,4 +9,5 @@ public class WorkshopAccountViewModel
 	public string Insurance { get; set; }
 	public string Tax { get; set; }
 	public string IsActiveSting { get; set; }
+	public string WorkshopIsActive { get; set; }
 }
\ No newline at end of file
diff --git a/CompanyManagment.EFCore/Repository/WorkshopAccountRepository.cs b/CompanyManagment.EFCore/Repository/WorkshopAccountRepository.cs
index 1e7f9d0b..c59f66bc 100644
--- a/CompanyManagment.EFCore/Repository/WorkshopAccountRepository.cs
+++ b/CompanyManagment.EFCore/Repository/WorkshopAccountRepository.cs
@@ -30,6 +30,7 @@ public class WorkshopAccountRepository : RepositoryBase<long, WorkshopAccount>,
 			Tax = x.Tax,
 			IsActiveSting = x.IsActiveSting,
 			WorkshopName = x.Workshop.WorkshopFullName,
+			WorkshopIsActive = x.Workshop.IsActiveString
 
 
 		}).ToList();
diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/EmployeesDocuments.cshtml.cs b/ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/EmployeesDocuments.cshtml.cs
index b2ca7875..817dfe6a 100644
--- a/ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/EmployeesDocuments.cshtml.cs
+++ b/ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/EmployeesDocuments.cshtml.cs
@@ -45,7 +45,8 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.WorkFlow
 		public IActionResult OnGetWorkshopsWithDocumentsAwaitingUploadAjax()
 		{
 			var accountId = _authHelper.CurrentAccountId();
-			var accountWorkshops = _workshopAccountRepository.GetList(accountId).Select(x => x.WorkshopId).ToList();
+			var accountWorkshops = _workshopAccountRepository.GetList(accountId).Where(x=>x.WorkshopIsActive == "true")
+				.Select(x => x.WorkshopId).ToList();
 			var resultData = _adminWorkFlowApplication.GetWorkshopsWithDocumentsAwaitingUploadForAdmin(accountWorkshops);
 
 			return new JsonResult(new
@@ -70,7 +71,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.WorkFlow
 		public async Task<IActionResult> OnGetClientRejectedDocumentWorkshopsForAdmin()
 		{
 			var accountId = _authHelper.CurrentAccountId();
-			var accountWorkshops = _workshopAccountRepository.GetList(accountId).Select(x => x.WorkshopId).ToList();
+			var accountWorkshops = _workshopAccountRepository.GetList(accountId).Where(x=>x.WorkshopIsActive == "true").Select(x => x.WorkshopId).ToList();
 			var resultData = await _employeeDocumentsApplication.GetClientRejectedDocumentWorkshopsForAdmin(accountWorkshops,_roleId);
 
 			return new JsonResult(new
@@ -95,7 +96,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.WorkFlow
 		public async Task<IActionResult> OnGetCreatedEmployeesWorkshopDocumentForAdmin()
 		{
 			var accountId = _authHelper.CurrentAccountId();
-			var accountWorkshops = _workshopAccountRepository.GetList(accountId).Select(x => x.WorkshopId).ToList();
+			var accountWorkshops = _workshopAccountRepository.GetList(accountId).Where(x=>x.WorkshopIsActive == "true").Select(x => x.WorkshopId).ToList();
 			var resultData = await _employeeDocumentsApplication.GetCreatedEmployeesWorkshopDocumentForAdmin(accountWorkshops, _roleId);
 
 			return new JsonResult(new
@@ -119,7 +120,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.WorkFlow
 		public async Task<IActionResult> OnGetWorkshopDocumentRejectedForAdmin()
 		{
 			var accountId = _authHelper.CurrentAccountId();
-			var accountWorkshops = _workshopAccountRepository.GetList(accountId).Select(x => x.WorkshopId).ToList();
+			var accountWorkshops = _workshopAccountRepository.GetList(accountId).Where(x=>x.WorkshopIsActive == "true").Select(x => x.WorkshopId).ToList();
 			var resultData =
 				await _employeeDocumentsApplication.GetWorkshopDocumentRejectedForAdmin(accountWorkshops,
 					_roleId);
@@ -147,7 +148,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.WorkFlow
 		public async Task<IActionResult> OnGetCountWorkFlowUploadDocument()
 		{
 			var accountId = _authHelper.CurrentAccountId();
-			var accountWorkshops = _workshopAccountRepository.GetList(accountId).Select(x => x.WorkshopId).ToList();
+			var accountWorkshops = _workshopAccountRepository.GetList(accountId).Where(x=>x.WorkshopIsActive == "true").Select(x => x.WorkshopId).ToList();
 
 			var resultDataWorkshopDocumentRejectedForAdmin = await _employeeDocumentsApplication.GetWorkshopDocumentRejectedForAdmin(accountWorkshops, _roleId);
 			var resultDataCreatedEmployeesWorkshopDocumentForAdmin = await _employeeDocumentsApplication.GetCreatedEmployeesWorkshopDocumentForAdmin(accountWorkshops, _roleId);
diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/Index.cshtml.cs b/ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/Index.cshtml.cs
index 36f95859..198a5583 100644
--- a/ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/Index.cshtml.cs
+++ b/ServiceHost/Areas/AdminNew/Pages/Company/WorkFlow/Index.cshtml.cs
@@ -32,7 +32,7 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.WorkFlow
         public async System.Threading.Tasks.Task OnGet()
 	    {
             var accountId = _authHelper.CurrentAccountId();
-            var accountWorkshops = _workshopAccountRepository.GetList(accountId).Select(x => x.WorkshopId).ToList();
+            var accountWorkshops = _workshopAccountRepository.GetList(accountId).Where(x=>x.WorkshopIsActive == "true").Select(x => x.WorkshopId).ToList();
             EmployeeDocumentsAwaitingSubmitCount = await _adminWorkFlowApplication.GetEmployeeDocumentWorkFlowCountsForAdmin(accountWorkshops,_roleId );
 		}