diff --git a/cidenc/encoder.go b/cidenc/encoder.go
index 6b8cefd75d9582c7127dc7d775b498dac7ccf4ed..83ef0168756fa9a422f851e6c4f95531cfbf389d 100644
--- a/cidenc/encoder.go
+++ b/cidenc/encoder.go
@@ -14,7 +14,7 @@ type Encoder struct {
 
 // Default return a new default encoder
 func Default() Encoder {
-	return Encoder{Base: mbase.MustNewEncoder(mbase.Base58BTC)}
+	return Encoder{Base: mbase.MustNewEncoder(mbase.Base32)}
 }
 
 // Encode encodes the cid using the parameters of the Encoder
diff --git a/cidenc/encoder_test.go b/cidenc/encoder_test.go
index a42ef34c46b0b872d8f3ae783c54b9d1d58beedc..225aa1f0c166622d4e63a9bc9d69115ec4ddeab4 100644
--- a/cidenc/encoder_test.go
+++ b/cidenc/encoder_test.go
@@ -59,4 +59,12 @@ func TestCidEncoder(t *testing.T) {
 	testRecode(enc, cidv0str, cidb32str)
 	testRecode(enc, cidv1str, cidb32str)
 	testRecode(enc, cidb32str, cidb32str)
+
+	enc = Default()
+	testEncode(enc, cidv0, cidv0str)
+	testEncode(enc, cidv1, cidb32str)
+	testRecode(enc, cidv0str, cidv0str)
+	testRecode(enc, cidv1str, cidb32str)
+	testRecode(enc, cidb32str, cidb32str)
+
 }
diff --git a/format_test.go b/format_test.go
index e102e7aa90f2b15a34aaa8444bd8ba1c1796a7a2..7bbefe9a58197940269056364be5638e2af69ed2 100644
--- a/format_test.go
+++ b/format_test.go
@@ -96,7 +96,7 @@ bafybeietjgsrl3eqpqpcabv3g6iubytsifvq24xrrhd3juetskltgq7dja.
 	offset := 0
 	for len(buf) > 0 {
 		_, j, _, cidStr := ScanForCid(buf)
-		if cidStr != "" && cids[idx]  != cidStr {
+		if cidStr != "" && cids[idx] != cidStr {
 			t.Fatalf("Scan failed, expected %s, got %s (idx=%d offset=%d)", cids[idx], cidStr, idx, offset)
 		}
 		buf = buf[j:]