diff --git a/src/iam/certmodules/certmodule.cpp b/src/iam/certmodules/certmodule.cpp
index 9084261c..7a0628e4 100644
--- a/src/iam/certmodules/certmodule.cpp
+++ b/src/iam/certmodules/certmodule.cpp
@@ -62,7 +62,7 @@ Error CertModule::GetCertificate(const Array<uint8_t>& issuer, const Array<uint8
 
         resCert = {};
         for (const auto& item : *certsInStorage) {
-            if (resCert.mNotAfter.IsZero() || item.mNotAfter < resCert.mNotAfter) {
+            if (resCert.mNotAfter.IsZero() || resCert.mNotAfter < item.mNotAfter) {
                 resCert = item;
             }
         }
diff --git a/tests/iam/iam_test.cpp b/tests/iam/iam_test.cpp
index 3555cf71..9b6afe4d 100644
--- a/tests/iam/iam_test.cpp
+++ b/tests/iam/iam_test.cpp
@@ -369,13 +369,13 @@ TEST_F(IAMTest, GetCertificateEmptySerial)
     ASSERT_TRUE(mStorage.GetCertsInfo("iam", storageCerts).IsNone());
     ASSERT_EQ(storageCerts.Size(), 2);
 
-    // check GetCertificate returns certificate with minimal mNotAfter
+    // check GetCertificate returns certificate with max mNotAfter
     CertInfo certInfo;
 
     const auto empty = Array<uint8_t>(nullptr, 0);
 
     ASSERT_TRUE(mCertHandler->GetCertificate("iam", empty, empty, certInfo).IsNone());
-    ASSERT_EQ(certInfo, storageCerts[0]);
+    ASSERT_EQ(certInfo, storageCerts[1]);
 }
 
 TEST_F(IAMTest, SubscribeCertReceiver)