diff --git a/src/main/java/io/confluent/connect/elasticsearch/DataConverter.java b/src/main/java/io/confluent/connect/elasticsearch/DataConverter.java
index ad88ca056..9d49bc798 100644
--- a/src/main/java/io/confluent/connect/elasticsearch/DataConverter.java
+++ b/src/main/java/io/confluent/connect/elasticsearch/DataConverter.java
@@ -70,17 +70,13 @@ public static String convertKey(Object key, Schema keySchema) {
     }
 
     switch (schemaType) {
-      case BOOLEAN:
       case INT8:
       case INT16:
       case INT32:
       case INT64:
-      case FLOAT32:
-      case FLOAT64:
       case STRING:
         return String.valueOf(key);
       default:
-        // TODO: support more key types, also should we support BOOLEAN and FLOAT at all?
         throw new DataException(schemaType.name() + "is not supported as the document id.");
     }
   }