diff --git a/handler_utils/sqs.go b/handler_utils/sqs.go
index 855bf1fcd1052f029402ec002c2cf12f96570288..4fd0727e286973fa6498cae28ce49a7de16d4494 100644
--- a/handler_utils/sqs.go
+++ b/handler_utils/sqs.go
@@ -37,17 +37,15 @@ func GetRecord(s3Session *s3.SessionWithHelpers, bucket string, message events.S
 	recordValuePtr := reflect.New(recordType)
 
 	// Check if message body should be retrieved from S3
-	if messageAttribute, ok := message.MessageAttributes[sqs.SQSMessageOnS3Key]; ok {
-		if messageAttribute.StringValue != nil && *messageAttribute.StringValue == "true" {
-			messageBytes, err := sqs.RetrieveMessageFromS3(s3Session, bucket, message.Body)
-			if err != nil {
-				return nil, errors.Wrapf(err, "failed to get sqs message body from s3")
-			}
+	if messageAttribute, ok := message.MessageAttributes[sqs.SQSMessageOnS3Key]; ok && messageAttribute.StringValue != nil && *messageAttribute.StringValue == "true" {
+		messageBytes, err := sqs.RetrieveMessageFromS3(s3Session, bucket, message.Body)
+		if err != nil {
+			return nil, errors.Wrapf(err, "failed to get sqs message body from s3")
+		}
 
-			err = json.Unmarshal(messageBytes, recordValuePtr.Interface())
-			if err != nil {
-				return nil, errors.Wrapf(err, "failed to JSON decode message body")
-			}
+		err = json.Unmarshal(messageBytes, recordValuePtr.Interface())
+		if err != nil {
+			return nil, errors.Wrapf(err, "failed to JSON decode message body")
 		}
 	} else {
 		// Message was small enough, it is contained in the message body