diff --git a/src/aof.c b/src/aof.c
index 7d31183e..9723fc33 100644
--- a/src/aof.c
+++ b/src/aof.c
@@ -1167,7 +1167,7 @@ int rewriteStreamObject(rio *r, robj *key, robj *o) {
         if (rioWriteBulkObject(r,key) == 0) return 0;
         if (rioWriteBulkString(r,"MAXLEN",6) == 0) return 0;
         if (rioWriteBulkString(r,"0",1) == 0) return 0;
-        if (rioWriteBulkString(r,"*",1) == 0) return 0;
+        if (rioWriteBulkStreamID(r,&s->last_id) == 0) return 0;
         if (rioWriteBulkString(r,"x",1) == 0) return 0;
         if (rioWriteBulkString(r,"y",1) == 0) return 0;
     }
diff --git a/tests/unit/type/stream.tcl b/tests/unit/type/stream.tcl
index c75bbb19..ae6c2d7b 100644
--- a/tests/unit/type/stream.tcl
+++ b/tests/unit/type/stream.tcl
@@ -375,14 +375,14 @@ start_server {tags {"xsetid"}} {
         assert {[dict get [r xinfo stream mystream] last-generated-id] == "200-0"}
     }
 
-    test {XSTREAM cannot SETID with smaller ID} {
+    test {XSETID cannot SETID with smaller ID} {
         r XADD mystream * a b
         catch {r XSETID mystream "1-1"} err
         r XADD mystream MAXLEN 0 * a b
         set err
     } {ERR*smaller*}
 
-    test {XSTREAM cannot SETID on non-existent key} {
+    test {XSETID cannot SETID on non-existent key} {
         catch {r XSETID stream 1-1} err
         set _ $err
     } {ERR no such key}