diff --git a/cmd/serve/s3/backend.go b/cmd/serve/s3/backend.go
index 55c63ce1b..305012f34 100644
--- a/cmd/serve/s3/backend.go
+++ b/cmd/serve/s3/backend.go
@@ -84,7 +84,10 @@ func (b *s3Backend) ListBucket(bucket string, prefix *gofakes3.Prefix, page gofa
 		err = b.entryListR(bucket, path, remaining, prefix.HasDelimiter, response)
 	}
 
-	if err != nil {
+	if err == gofakes3.ErrNoSuchKey {
+		// AWS just returns an empty list
+		response = gofakes3.NewObjectList()
+	} else if err != nil {
 		return nil, err
 	}