diff --git a/atst/domain/environments.py b/atst/domain/environments.py
index 2a9c5f61..39d6214c 100644
--- a/atst/domain/environments.py
+++ b/atst/domain/environments.py
@@ -56,20 +56,20 @@ class Environments(object):
         if env_role and env_role.role != new_role and not env_role.deleted:
             env_role.role = new_role
             updated = True
-            db.session.add(env_role)
-        elif not env_role:
+        elif not env_role and new_role:
             env_role = EnvironmentRoles.create(
                 application_role=application_role,
                 environment=environment,
                 role=new_role,
             )
             updated = True
-            db.session.add(env_role)
 
-        if new_role is None:
+        if env_role and not new_role:
+            env_role.role = None
             updated = EnvironmentRoles.delete(application_role.id, environment.id)
 
         if updated:
+            db.session.add(env_role)
             db.session.commit()
 
         return updated
diff --git a/atst/forms/application_member.py b/atst/forms/application_member.py
index 152e0ddb..e44d2ad9 100644
--- a/atst/forms/application_member.py
+++ b/atst/forms/application_member.py
@@ -16,7 +16,7 @@ class EnvironmentForm(Form):
         environment_name,
         choices=ENV_ROLES,
         default=NO_ACCESS,
-        filters=[lambda x: None if x == "None" else x],
+        filters=[lambda x: NO_ACCESS if x == "None" else x],
     )
     deleted = BooleanField("Revoke Access", default=False)