diff --git a/.pick_status.json b/.pick_status.json
index e962b72a4a7..e16f93addf2 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -8674,7 +8674,7 @@
         "description": "util: check and initialize locale before using it",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/util/strtod.c b/src/util/strtod.c
index b42dc2e55b9..3f65eca93c0 100644
--- a/src/util/strtod.c
+++ b/src/util/strtod.c
@@ -69,6 +69,7 @@ double
 _mesa_strtod(const char *s, char **end)
 {
 #if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L)
+   if (!loc) _mesa_locale_init();
    return strtod_l(s, end, loc);
 #else
    return strtod(s, end);
@@ -84,6 +85,7 @@ float
 _mesa_strtof(const char *s, char **end)
 {
 #if defined(_GNU_SOURCE) && defined(HAVE_STRTOD_L)
+   if (!loc) _mesa_locale_init();
    return strtof_l(s, end, loc);
 #elif defined(HAVE_STRTOF)
    return strtof(s, end);