diff --git a/README.md b/README.md
index 1cc285c0..d93ce008 100644
--- a/README.md
+++ b/README.md
@@ -86,7 +86,6 @@ Restart Claude Code. Context from previous sessions will automatically appear in
 - ⚙️ **Context Configuration** - Fine-grained control over what context gets injected
 - 🤖 **Automatic Operation** - No manual intervention required
 - 🔗 **Citations** - Reference past observations with IDs (access via http://localhost:37777/api/observation/{id} or view all in the web viewer at http://localhost:37777)
-- 🧪 **Beta Channel** - Try experimental features like Endless Mode via version switching
 
 ---
 
@@ -206,6 +205,8 @@ See [Search Tools Guide](https://docs.claude-mem.ai/usage/search-tools) for deta
 
 ## Beta Features & Endless Mode
 
+> **Note**: Endless Mode is an **experimental feature in the beta branch only**. It is not included in the stable release you install via the marketplace. You must manually switch to the beta channel to try it, and it comes with significant caveats (see below).
+
 Claude-Mem offers a **beta channel** with experimental features. Switch between stable and beta versions directly from the web viewer UI.
 
 ### How to Try Beta
@@ -230,13 +231,17 @@ Working Memory (Context):     Compressed observations (~500 tokens each)
 Archive Memory (Disk):        Full tool outputs preserved for recall
 ```
 
-**Expected Results**:
-- ~95% token reduction in context window
-- ~20x more tool uses before context exhaustion
+**Projected Results** (based on theoretical modeling, not production measurements):
+- Significant token reduction in context window
+- More tool uses before context exhaustion
 - Linear O(N) scaling instead of quadratic O(N²)
 - Full transcripts preserved for perfect recall
 
-**Caveats**: Adds latency (60-90s per tool for observation generation), still experimental.
+**Important Caveats**:
+- **Not in stable release** - You must switch to beta branch to use this feature
+- **Still in development** - May have bugs, breaking changes, or incomplete functionality
+- **Slower than standard mode** - Blocking observation generation adds latency to each tool use
+- **Theoretical projections** - The efficiency claims above are based on simulations, not real-world production data
 
 See [Beta Features Documentation](https://docs.claude-mem.ai/beta-features) for details.
 
diff --git a/docs/public/beta-features.mdx b/docs/public/beta-features.mdx
index a925e690..db8ee420 100644
--- a/docs/public/beta-features.mdx
+++ b/docs/public/beta-features.mdx
@@ -5,6 +5,10 @@ description: "Try experimental features like Endless Mode before they're release
 
 # Beta Features
 
+<Warning>
+**Endless Mode is experimental and not included in the stable release.** You must manually switch to the beta branch to try it. The efficiency projections below are based on theoretical modeling, not production measurements. Expect slower performance than standard mode and potential bugs.
+</Warning>
+
 Claude-Mem offers a beta channel for users who want to try experimental features before they're released to the stable channel.
 
 ## Version Channel Switching
@@ -77,19 +81,22 @@ Archive Memory (Transcript File):
 
 This transforms O(N²) scaling into O(N) - linear instead of quadratic.
 
-### Expected Results
+### Projected Results
 
-Based on analysis of real sessions:
+Based on theoretical modeling (not production measurements):
 
-- **Token savings**: ~95% reduction in context window usage
-- **Efficiency gain**: ~20x more tool uses before context exhaustion
+- **Token savings**: Significant reduction in context window usage
+- **Efficiency gain**: More tool uses before context exhaustion
 - **Quality preservation**: Observations cache the synthesis result, so no information is lost
 
-### Caveats
+### Important Caveats
 
-Endless Mode is experimental:
+Endless Mode is experimental and has significant limitations:
 
-- **Adds latency** - Blocking hooks wait for observation generation (60-90s per tool use)
+- **Not in stable release** - You must manually switch to the beta branch to use this feature
+- **Still in development** - May have bugs, breaking changes, or incomplete functionality
+- **Slower than standard mode** - Blocking observation generation adds latency to each tool use
+- **Theoretical projections** - The efficiency claims above are based on simulations, not real-world production data
 - **Requires working database** - Observations must save successfully for transformation
 - **New architecture** - Less battle-tested than standard mode
 
diff --git a/docs/public/configuration.mdx b/docs/public/configuration.mdx
index 4c8602d0..52b992ff 100644
--- a/docs/public/configuration.mdx
+++ b/docs/public/configuration.mdx
@@ -179,7 +179,9 @@ Claude-Mem supports switching between stable and beta versions via the web viewe
 
 **Your memory data is preserved** when switching versions. Only the plugin code changes.
 
-See [Beta Features](beta-features) for details on what's available in beta.
+<Note>
+Endless Mode is experimental and slower than standard mode. See [Beta Features](beta-features) for full details and important limitations.
+</Note>
 
 ## Worker Service Management