diff --git a/.pick_status.json b/.pick_status.json
index 4c039b4f573..a78eb87e2be 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -204,7 +204,7 @@
         "description": "util: check for setgid() as well in __normal_user()",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/util/u_debug.h b/src/util/u_debug.h
index 69e0430d09b..2f1a2dabed1 100644
--- a/src/util/u_debug.h
+++ b/src/util/u_debug.h
@@ -399,7 +399,7 @@ __normal_user(void)
 #if defined(_WIN32)
    return true;
 #else
-   return geteuid() == getuid();
+   return geteuid() == getuid() && getegid() == getgid();
 #endif
 }