diff --git a/devops-service/app/api2/handlers/project.rb b/devops-service/app/api2/handlers/project.rb
index 4eef0ad..7a33657 100644
--- a/devops-service/app/api2/handlers/project.rb
+++ b/devops-service/app/api2/handlers/project.rb
@@ -81,8 +81,10 @@ module Devops
           env = parser.add_or_update_deploy_env
           begin
             db_env = project.deploy_env(deploy_env)
-            servers = Devops::Db.connector.servers_by_project_and_deploy_env(id, deploy_env)
-            raise InvalidRecord.new("Can not update environment '#{deploy_env}', there are #{servers.size} servers on it") unless servers.empty?
+            unless env.identifier == deploy_env
+              servers = Devops::Db.connector.servers_by_project_and_deploy_env(id, deploy_env)
+              raise InvalidRecord.new("Can not update environment '#{deploy_env}', there are #{servers.size} servers on it") unless servers.empty?
+            end
             begin
               project.deploy_env(env.identifier)
               raise InvalidRecord.new("Can not change environment '#{deploy_env}' to '#{env.identifier}', environment '#{env.identifier}' already exist") unless deploy_env == env.identifier