diff --git a/library/x509_crt.c b/library/x509_crt.c
index 0089ef2..89fea41 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -3071,15 +3071,13 @@
             continue;
         }
 
+        *r_parent = parent_crt;
+        *r_signature_is_good = signature_is_good;
+
         break;
     }
 
-    if( parent_crt != NULL )
-    {
-        *r_parent = parent_crt;
-        *r_signature_is_good = signature_is_good;
-    }
-    else
+    if( parent_crt == NULL )
     {
 #if defined(MBEDTLS_HAVE_TIME_DATE)
         *r_parent = fallback_parent;