diff --git a/nx/include/switch/services/set.h b/nx/include/switch/services/set.h
index 609957be..549b561f 100644
--- a/nx/include/switch/services/set.h
+++ b/nx/include/switch/services/set.h
@@ -184,6 +184,6 @@ Result setsysGetDeviceNickname(char* buffer);
 
 /**
  * @brief Sets the system's nickname.
- * @param buffer Pointer to read the nickname from. (The buffer size needs to be at least 0x80 bytes)
+ * @param buffer Pointer to read the nickname from.
  */
 Result setsysSetDeviceNickname(const char* buffer);
diff --git a/nx/source/services/set.c b/nx/source/services/set.c
index 737dcc04..2a606c13 100644
--- a/nx/source/services/set.c
+++ b/nx/source/services/set.c
@@ -724,7 +724,7 @@ Result setsysSetDeviceNickname(const char* buffer) {
     IpcCommand c;
     ipcInitialize(&c);
 
-    ipcAddSendBuffer(&c, buffer, 0x80, BufferType_Normal);
+    ipcAddSendBuffer(&c, buffer, strlen(buffer) + 1, BufferType_Normal);
 
     struct {
         u64 magic;