diff --git a/src/main/java/com/microsoft/store/partnercenter/network/PartnerServiceRetryStrategy.java b/src/main/java/com/microsoft/store/partnercenter/network/PartnerServiceRetryStrategy.java
index da66bee..240e365 100644
--- a/src/main/java/com/microsoft/store/partnercenter/network/PartnerServiceRetryStrategy.java
+++ b/src/main/java/com/microsoft/store/partnercenter/network/PartnerServiceRetryStrategy.java
@@ -63,7 +63,11 @@ public boolean shouldRetry(int retryCount, Response response)
     {
         double exponentialBackOffTime = (Math.pow(2, retryCount) - 1) / 2;
 
-        if(retryCount > maxRetryAttempts && nonRetryableHttpCodes.contains(response.code()))
+        if(nonRetryableHttpCodes.contains(response.code()))
+        {
+            return false;
+        }
+        if(retryCount > maxRetryAttempts)
         {
             return false;
         }