diff --git a/src/core/server/kibana_config.test.ts b/src/core/server/kibana_config.test.ts
index e2a3ab1a8a9a6..813cdad65a406 100644
--- a/src/core/server/kibana_config.test.ts
+++ b/src/core/server/kibana_config.test.ts
@@ -58,7 +58,7 @@ describe('deprecations', () => {
       const { messages } = applyKibanaDeprecations({ index });
       expect(messages).toMatchInlineSnapshot(`
       Array [
-        "Multitenancy by changing 'kibana.index' is no longer supported. See https://ela.st/kbn-remove-legacy-multitenancy for more details",
+        "Multitenancy by changing 'kibana.index' will not be supported starting in 8.0. See https://ela.st/kbn-remove-legacy-multitenancy for more details",
       ]
     `);
     });
diff --git a/src/core/server/kibana_config.ts b/src/core/server/kibana_config.ts
index f93a750f658c0..8623c8dad2e90 100644
--- a/src/core/server/kibana_config.ts
+++ b/src/core/server/kibana_config.ts
@@ -27,7 +27,7 @@ const deprecations: ConfigDeprecationProvider = () => [
     const kibana = settings[fromPath];
     if (kibana?.index) {
       log(
-        `Multitenancy by changing 'kibana.index' is no longer supported. See https://ela.st/kbn-remove-legacy-multitenancy for more details`
+        `Multitenancy by changing 'kibana.index' will not be supported starting in 8.0. See https://ela.st/kbn-remove-legacy-multitenancy for more details`
       );
     }
     return settings;