diff --git a/AFNetworking/AFURLConnectionOperation.m b/AFNetworking/AFURLConnectionOperation.m
index ca9780c..9b59381 100644
--- a/AFNetworking/AFURLConnectionOperation.m
+++ b/AFNetworking/AFURLConnectionOperation.m
@@ -581,21 +581,22 @@ willSendRequestForAuthenticationChallenge:(NSURLAuthenticationChallenge *)challe
                     break;
                 }
                 case AFSSLPinningModeNone: {
-#ifdef _AFNETWORKING_ALLOW_INVALID_SSL_CERTIFICATES_
-                    NSURLCredential *credential = [NSURLCredential credentialForTrust:serverTrust];
-                    [[challenge sender] useCredential:credential forAuthenticationChallenge:challenge];
-#else
-                    SecTrustResultType result = 0;
-                    OSStatus status = SecTrustEvaluate(serverTrust, &result);
-                    NSAssert(status == noErr, @"SecTrustEvaluate error: %ld", (long int)status);
-                    
-                    if (result == kSecTrustResultUnspecified || result == kSecTrustResultProceed) {
+                    if(self.allowInvalidSSLCertificate == YES){
                         NSURLCredential *credential = [NSURLCredential credentialForTrust:serverTrust];
                         [[challenge sender] useCredential:credential forAuthenticationChallenge:challenge];
-                    } else {
-                        [[challenge sender] cancelAuthenticationChallenge:challenge];
                     }
-#endif
+                    else {
+                        SecTrustResultType result = 0;
+                        OSStatus status = SecTrustEvaluate(serverTrust, &result);
+                        NSAssert(status == noErr, @"SecTrustEvaluate error: %ld", (long int)status);
+                        
+                        if (result == kSecTrustResultUnspecified || result == kSecTrustResultProceed) {
+                            NSURLCredential *credential = [NSURLCredential credentialForTrust:serverTrust];
+                            [[challenge sender] useCredential:credential forAuthenticationChallenge:challenge];
+                        } else {
+                            [[challenge sender] cancelAuthenticationChallenge:challenge];
+                        }
+                    }
                     break;
                 }
             }