diff --git a/src/security/tpm/tspi/tspi.c b/src/security/tpm/tspi/tspi.c
index 3be98a2d86..3dc63fc677 100644
--- a/src/security/tpm/tspi/tspi.c
+++ b/src/security/tpm/tspi/tspi.c
@@ -71,6 +71,10 @@ static uint32_t tpm_setup_s3_helper(void)
 
 	default:
 		printk(BIOS_ERR, "TPM: Resume failed (%#x).\n", result);
+		if (CONFIG(TPM2)) {
+			printk(BIOS_WARNING, "TPM: Clearing state\n");
+			result = tlcl_startup();
+		}
 		break;
 	}