diff --git a/CHANGELOG.md b/CHANGELOG.md
index d067b939ad0a9318a83d728921a567fb7d98c69d..dda097aee06493709f6a79a3e2713bf0f3925bf0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr
 ## [Unreleased]
 ### Changed
 - Default runtime HTTP key value is no longer the same as the default Server key value.
+- Group create now returns HTTP 409 Conflict/GRPC Code 6 when group name is already in use.
 
 ## [2.7.0] - 2019-09-11
 ### Added
diff --git a/server/api_group.go b/server/api_group.go
index c5fa3e12e47e9c076df1183514c4181840ae63c3..2c48b1c65f16114a5afea1dcf3370af8410ede50 100644
--- a/server/api_group.go
+++ b/server/api_group.go
@@ -65,7 +65,7 @@ func (s *ApiServer) CreateGroup(ctx context.Context, in *api.CreateGroupRequest)
 	group, err := CreateGroup(ctx, s.logger, s.db, userID, userID, in.GetName(), in.GetLangTag(), in.GetDescription(), in.GetAvatarUrl(), "", in.GetOpen(), maxCount)
 	if err != nil {
 		if err == ErrGroupNameInUse {
-			return nil, status.Error(codes.InvalidArgument, "Group name is in use.")
+			return nil, status.Error(codes.AlreadyExists, "Group name is in use.")
 		}
 		return nil, status.Error(codes.Internal, "Error while trying to create group.")
 	}