diff --git a/db/schema_features.hh b/db/schema_features.hh
index 2219772007..d0a4bb1c96 100644
--- a/db/schema_features.hh
+++ b/db/schema_features.hh
@@ -30,6 +30,9 @@ enum class schema_feature {
 
     // Unused.  Defined for backward compatibility only
     IN_MEMORY_TABLES,
+
+    // Per-table tablet options
+    TABLET_OPTIONS,
 };
 
 using schema_features = enum_set<super_enum<schema_feature,
@@ -39,7 +42,8 @@ using schema_features = enum_set<super_enum<schema_feature,
     schema_feature::SCYLLA_AGGREGATES,
     schema_feature::TABLE_DIGEST_INSENSITIVE_TO_EXPIRY,
     schema_feature::GROUP0_SCHEMA_VERSIONING,
-    schema_feature::IN_MEMORY_TABLES
+    schema_feature::IN_MEMORY_TABLES,
+    schema_feature::TABLET_OPTIONS
     >>;
 
 }
diff --git a/gms/feature_service.cc b/gms/feature_service.cc
index d687369028..8f3ff69ad0 100644
--- a/gms/feature_service.cc
+++ b/gms/feature_service.cc
@@ -237,6 +237,7 @@ db::schema_features feature_service::cluster_schema_features() const {
     f.set_if<db::schema_feature::TABLE_DIGEST_INSENSITIVE_TO_EXPIRY>(table_digest_insensitive_to_expiry);
     f.set_if<db::schema_feature::GROUP0_SCHEMA_VERSIONING>(group0_schema_versioning);
     f.set_if<db::schema_feature::IN_MEMORY_TABLES>(bool(in_memory_tables));
+    f.set_if<db::schema_feature::TABLET_OPTIONS>(bool(tablet_options));
     return f;
 }
 
diff --git a/gms/feature_service.hh b/gms/feature_service.hh
index 1807d73719..6dcfce05d7 100644
--- a/gms/feature_service.hh
+++ b/gms/feature_service.hh
@@ -163,6 +163,7 @@ public:
     gms::feature workload_prioritization { *this, "WORKLOAD_PRIORITIZATION"sv };
     gms::feature file_stream { *this, "FILE_STREAM"sv };
     gms::feature compression_dicts { *this, "COMPRESSION_DICTS"sv };
+    gms::feature tablet_options { *this, "TABLET_OPTIONS"sv };
 public:
 
     const std::unordered_map<sstring, std::reference_wrapper<feature>>& registered_features() const;