diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/sql/ProtoRowsMergingStateMachine.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/sql/ProtoRowsMergingStateMachine.java
index 61788fc4b1..351656dcd4 100644
--- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/sql/ProtoRowsMergingStateMachine.java
+++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/sql/ProtoRowsMergingStateMachine.java
@@ -199,9 +199,11 @@ static void validateValueAndType(SqlType<?> type, Value value) {
         checkExpectedKind(value, Value.KindCase.STRING_VALUE, type);
         break;
       case BYTES:
+      case PROTO:
         checkExpectedKind(value, Value.KindCase.BYTES_VALUE, type);
         break;
       case INT64:
+      case ENUM:
         checkExpectedKind(value, Value.KindCase.INT_VALUE, type);
         break;
       case FLOAT64:
@@ -253,10 +255,6 @@ static void validateValueAndType(SqlType<?> type, Value value) {
               mapType.getValueType(), mapElement.getArrayValue().getValuesList().get(1));
         }
         break;
-      case PROTO:
-        checkExpectedKind(value, Value.KindCase.BYTES_VALUE, type);
-      case ENUM:
-        checkExpectedKind(value, Value.KindCase.INT_VALUE, type);
       default:
         // This should be caught already at ResultSetMetadata creation
         throw new IllegalStateException("Unrecognized type: " + type);