diff --git a/aws/resource_aws_iam_user.go b/aws/resource_aws_iam_user.go
index 74bb711f7ca..b7930f1d0e1 100644
--- a/aws/resource_aws_iam_user.go
+++ b/aws/resource_aws_iam_user.go
@@ -232,6 +232,7 @@ func resourceAwsIamUserDelete(d *schema.ResourceData, meta interface{}) error {
 				if isAWSErr(err, iam.ErrCodeEntityTemporarilyUnmodifiableException, "") {
 					return resource.RetryableError(err)
 				}
+				return resource.NonRetryableError(err)
 			}
 			return nil
 		})