diff --git a/digest/digest.go b/digest/digest.go
index efbe49bd7..06e9fad80 100644
--- a/digest/digest.go
+++ b/digest/digest.go
@@ -112,6 +112,10 @@ func (d Digest) Validate() error {
 
 	// Continue on for general parser
 
+	if !DigestRegexp.MatchString(s) {
+		return ErrDigestInvalidFormat
+	}
+
 	i := strings.Index(s, ":")
 	if i < 0 {
 		return ErrDigestInvalidFormat
@@ -129,8 +133,6 @@ func (d Digest) Validate() error {
 		return ErrDigestUnsupported
 	}
 
-	// TODO(stevvooe): Use DigestRegexp to validate digest here.
-
 	return nil
 }