1 files changed, 3 insertions, 2 deletions
diff --git a/Software/Visual_Studio/Web/Tango.MachineService.Gateway/Controllers/GatewayController.cs b/Software/Visual_Studio/Web/Tango.MachineService.Gateway/Controllers/GatewayController.cs
index e3391cd5d..e393c7264 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService.Gateway/Controllers/GatewayController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService.Gateway/Controllers/GatewayController.cs
@@ -20,7 +20,7 @@ namespace Tango.MachineService.Gateway.Controllers
 
             using (GatewayDbContext db = GatewayDbContext.CreateDefault())
             {
-                var envs = db.Environments.ToList();
+                var envs = db.Environments.Where(x => x.Active).ToList();
 
                 foreach (var env in envs)
                 {
@@ -29,7 +29,8 @@ namespace Tango.MachineService.Gateway.Controllers
                         ID = env.ID.ToString(),
                         Name = env.Name,
                         Description = env.Description,
-                        MachineServiceAddress = env.MachineServiceAddress
+                        MachineServiceAddress = env.MachineServiceAddress,
+                        DisplayIndex = env.DisplayIndex
                     });
                 }
             }