diff --git a/registry/storage/driver/s3/s3.go b/registry/storage/driver/s3/s3.go
index 7672fbdb..a9f303dc 100644
--- a/registry/storage/driver/s3/s3.go
+++ b/registry/storage/driver/s3/s3.go
@@ -685,6 +685,12 @@ func (d *driver) List(ctx context.Context, path string) ([]string, error) {
 		return nil, err
 	}
 
+	if len(listResponse.Contents) == 0 {
+		// Treat empty response as missing directory, since we don't actually
+		// have directories in s3.
+		return nil, storagedriver.PathNotFoundError{Path: path}
+	}
+
 	files := []string{}
 	directories := []string{}