diff --git a/storage/tokudb/ha_tokudb.h b/storage/tokudb/ha_tokudb.h
index c17a4628a11..6c4055fc621 100644
--- a/storage/tokudb/ha_tokudb.h
+++ b/storage/tokudb/ha_tokudb.h
@@ -833,7 +833,7 @@ static inline bool key_is_clustering(const KEY *key) {
 #else
 
 static inline bool key_is_clustering(const KEY *key) {
-    return key->option_struct && key->option_struct->clustering;
+    return key->flags & HA_CLUSTERING;
 }
 #endif