diff --git a/client/src/fido/cbortools.c b/client/src/fido/cbortools.c
index d58b11145..2eb386bc2 100644
--- a/client/src/fido/cbortools.c
+++ b/client/src/fido/cbortools.c
@@ -155,8 +155,18 @@ static CborError dumprecursive(uint8_t cmdCode, bool isResponse, CborValue *it,
                 got_next = true;
                 break;
             }
-
-            default: {
+            case CborByteStringType:
+            case CborTextStringType:
+            case CborTagType:
+            case CborSimpleType:
+            case CborBooleanType:
+            case CborNullType:
+            case CborUndefinedType:
+            case CborHalfFloatType:
+            case CborFloatType:
+            case CborDoubleType:
+            case CborInvalidType:
+            case CborIntegerType: {
                 err = dumpelm(it, &got_next, (isMapType && (elmCount % 2)) ? 0 : nestingLevel);
                 if (err)
                     return err;