diff --git a/src/java/org/apache/cassandra/cli/CliClient.java b/src/java/org/apache/cassandra/cli/CliClient.java
index b32b0f7dc9..a7e8d92564 100644
--- a/src/java/org/apache/cassandra/cli/CliClient.java
+++ b/src/java/org/apache/cassandra/cli/CliClient.java
@@ -1822,7 +1822,7 @@ public class CliClient
                   .append(TAB + TAB + "index_name : '" + CliUtils.escapeSQLString(colDef.index_name) + "'," + NEWLINE)
                   .append(TAB + TAB + "index_type : " + CliUtils.escapeSQLString(Integer.toString(colDef.index_type.getValue())));
 
-            if (colDef.index_options != null)
+            if (colDef.index_options != null && !colDef.index_options.isEmpty())
             {
                 output.append(",").append(NEWLINE);
                 output.append(TAB + TAB + "index_options : {" + NEWLINE);