diff --git a/hal/src/main/native/athena/FRCDriverStation.cpp b/hal/src/main/native/athena/FRCDriverStation.cpp
index 3d5f207aa9..c2251667ba 100644
--- a/hal/src/main/native/athena/FRCDriverStation.cpp
+++ b/hal/src/main/native/athena/FRCDriverStation.cpp
@@ -302,7 +302,7 @@ char* HAL_GetJoystickName(int32_t joystickNum) {
   } else {
     size_t len = std::strlen(joystickDesc.name);
     char* name = static_cast<char*>(std::malloc(len + 1));
-    std::strncpy(name, joystickDesc.name, len);
+    std::memcpy(name, joystickDesc.name, len);
     name[len] = '\0';
     return name;
   }