diff --git a/src/joystick.c b/src/joystick.c
index 59107e31..9c20303d 100644
--- a/src/joystick.c
+++ b/src/joystick.c
@@ -136,13 +136,13 @@ GLFWAPI const char* glfwGetJoystickName(int joy)
     if (!_glfwInitialized)
     {
         _glfwSetError(GLFW_NOT_INITIALIZED, NULL);
-        return 0;
+        return NULL;
     }
 
     if (joy < 0 || joy > GLFW_JOYSTICK_LAST)
     {
         _glfwSetError(GLFW_INVALID_ENUM, NULL);
-        return 0;
+        return NULL;
     }
 
     return _glfwPlatformGetJoystickName(joy);