diff --git a/src/t_stream.c b/src/t_stream.c
index c071c3dc..87200594 100644
--- a/src/t_stream.c
+++ b/src/t_stream.c
@@ -1391,7 +1391,8 @@ NULL
         if (cg) {
             addReply(c,shared.ok);
         } else {
-            addReplyError(c,"Consumer Group name already exists");
+            addReplySds(c,
+                sdsnew("-BUSYGROUP Consumer Group name already exists\r\n"));
         }
     } else if (!strcasecmp(opt,"SETID") && c->argc == 5) {
     } else if (!strcasecmp(opt,"DELGROUP") && c->argc == 4) {
diff --git a/tests/unit/type/stream-cgroups.tcl b/tests/unit/type/stream-cgroups.tcl
new file mode 100644
index 00000000..9a657a9e
--- /dev/null
+++ b/tests/unit/type/stream-cgroups.tcl
@@ -0,0 +1,11 @@
+start_server {
+    tags {"stream"}
+} {
+    test {XGROUP CREATE: creation and duplicate group name detection} {
+        r DEL mystream
+        r XADD mystream * foo bar
+        r XGROUP CREATE mystream mygroup $
+        catch {r XGROUP CREATE mystream mygroup $} err
+        set err
+    } {BUSYGROUP*}
+}