diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c
index 98f3d9b5ba..1c5fffa8c8 100644
--- a/src/shared/tpm2-util.c
+++ b/src/shared/tpm2-util.c
@@ -9296,6 +9296,13 @@ int tpm2_nvpcr_initialize(
                                 signature_json,
                                 &authorize_policy,
                                 &policy_session);
+                if (r == -EUCLEAN) {
+                        /* A PCR was extended while we submitted the policy, so this session is unusable.
+                         * Same situation as below, just observed while building the policy rather than
+                         * while writing. */
+                        if (i > 0)
+                                continue;
+                }
                 if (r < 0)
                         return r;