diff --git a/src/aws.c b/src/aws.c
index 798cd9c61f5cabb21cf378e9b9f323d04611eb4d..9ad3189965322583a6c0d3c93f1dedcdec01537a 100644
--- a/src/aws.c
+++ b/src/aws.c
@@ -561,7 +561,8 @@ enum resource_type connection_get_resource_type(struct connection *conn)
 	if (conn == NULL || conn->request_path[0] == '\0')
 		return RESOURCE_TYPE_NONE;
 
-	char *first_part = strtok(conn->request_path, "/");
+	char *saveptr;
+	char *first_part = strtok_r(conn->request_path, "/", &saveptr);
 
 	if (first_part == NULL)
 		return RESOURCE_TYPE_NONE;