diff --git a/Netch/Models/Server.cs b/Netch/Models/Server.cs
index 3bf89853..a70eec89 100644
--- a/Netch/Models/Server.cs
+++ b/Netch/Models/Server.cs
@@ -184,7 +184,7 @@ namespace Netch.Models
                 }
             }
 
-            Group = Group.Equals("None") ? Group.ToUpper() : Group;
+            Group = Group.Equals("None") || Group.Equals("") ? "NONE" : Group;
 
             switch (Type)
             {