diff --git a/payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/PostalCodeConfig.kt b/payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/PostalCodeConfig.kt
index 1afeaefac13..c428f805b0a 100644
--- a/payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/PostalCodeConfig.kt
+++ b/payments-ui-core/src/main/java/com/stripe/android/ui/core/elements/PostalCodeConfig.kt
@@ -36,18 +36,20 @@ internal class PostalCodeConfig(
         }
 
         override fun getError(): FieldError? {
-            return when {
-                input.isNotBlank() && !isFull() && country == "US" -> {
-                    FieldError(R.string.address_zip_invalid)
-                }
-                input.isNotBlank() && !isFull() -> {
-                    FieldError(R.string.address_zip_postal_invalid)
-                }
-                else -> null
+            return if (!isValid()) {
+                FieldError(
+                    errorMessage = if (country == "US") {
+                        R.string.address_zip_invalid
+                    } else {
+                        R.string.address_zip_postal_invalid
+                    }
+                )
+            } else {
+                null
             }
         }
 
-        override fun isFull(): Boolean = input.length >= format.minimumLength
+        override fun isFull(): Boolean = input.length >= format.maximumLength
 
         override fun isBlank(): Boolean = input.isBlank()
     }