diff --git a/crypto/s2n_fips.c b/crypto/s2n_fips.c
index 459e47e02a3..f8d09932c00 100644
--- a/crypto/s2n_fips.c
+++ b/crypto/s2n_fips.c
@@ -67,12 +67,7 @@ int s2n_is_in_fips_mode(void)
 int s2n_is_fips(bool *fips)
 {
     POSIX_ENSURE_REF(fips);
-    *fips = false;
     POSIX_ENSURE(s2n_is_initialized(), S2N_ERR_NOT_INITIALIZED);
-
-    if (s2n_is_in_fips_mode()) {
-        *fips = true;
-    }
-
+    *fips = s2n_is_in_fips_mode();
     return S2N_SUCCESS;
 }
diff --git a/tests/unit/s2n_fips_test.c b/tests/unit/s2n_fips_test.c
index 4e964ef0cf0..d46540b25dd 100644
--- a/tests/unit/s2n_fips_test.c
+++ b/tests/unit/s2n_fips_test.c
@@ -24,9 +24,8 @@ int main()
 
     /* s2n_is_fips() fails before init */
     {
-        bool fips = true;
+        bool fips = false;
         EXPECT_FAILURE_WITH_ERRNO(s2n_is_fips(&fips), S2N_ERR_NOT_INITIALIZED);
-        EXPECT_FALSE(fips);
     }
 
     EXPECT_SUCCESS(s2n_init());