diff --git a/apps/site/open-next.config.ts b/apps/site/open-next.config.ts
index 03f1c01730dc2..5943abf40159c 100644
--- a/apps/site/open-next.config.ts
+++ b/apps/site/open-next.config.ts
@@ -1,7 +1,8 @@
 import { defineCloudflareConfig } from '@opennextjs/cloudflare';
 import r2IncrementalCache from '@opennextjs/cloudflare/overrides/incremental-cache/r2-incremental-cache';
 import { withRegionalCache } from '@opennextjs/cloudflare/overrides/incremental-cache/regional-cache';
-import doQueue from '@opennextjs/cloudflare/overrides/queue/do-queue';
+import memoryQueue from '@opennextjs/cloudflare/overrides/queue/memory-queue';
+import queueCache from '@opennextjs/cloudflare/overrides/queue/queue-cache';
 
 import type { OpenNextConfig } from '@opennextjs/cloudflare';
 
@@ -14,7 +15,7 @@ const cloudflareConfig = defineCloudflareConfig({
   incrementalCache: withRegionalCache(r2IncrementalCache, {
     mode: 'long-lived',
   }),
-  queue: doQueue,
+  queue: queueCache(memoryQueue),
   enableCacheInterception: true,
 });
 
diff --git a/apps/site/wrangler.jsonc b/apps/site/wrangler.jsonc
index 60e8049b6ba55..4cb72688a59af 100644
--- a/apps/site/wrangler.jsonc
+++ b/apps/site/wrangler.jsonc
@@ -45,20 +45,6 @@
       "bucket_name": "next-cache-r2-for-open-next-website",
     },
   ],
-  "durable_objects": {
-    "bindings": [
-      {
-        "name": "NEXT_CACHE_DO_QUEUE",
-        "class_name": "DOQueueHandler",
-      },
-    ],
-  },
-  "migrations": [
-    {
-      "tag": "v1",
-      "new_sqlite_classes": ["DOQueueHandler"],
-    },
-  ],
   "version_metadata": {
     // CF_VERSION_METADATA used for sentry
     // See: https://docs.sentry.io/platforms/javascript/guides/cloudflare/#release-configuration-optional
diff --git a/packages/ui-components/src/Containers/Article/index.module.css b/packages/ui-components/src/Containers/Article/index.module.css
index 8d3dccdfd9a8f..f2df1c4400b0e 100644
--- a/packages/ui-components/src/Containers/Article/index.module.css
+++ b/packages/ui-components/src/Containers/Article/index.module.css
@@ -17,8 +17,8 @@
 
   > *:nth-child(1) {
     @apply ml:sticky
-      ml:top-0
-      ml:h-svh
+      ml:top-[var(--header-height)]
+      ml:h-[calc(100svh-var(--header-height))]
       ml:overflow-y-auto
       [grid-area:sidebar];
   }
diff --git a/packages/ui-components/src/Containers/Sidebar/index.module.css b/packages/ui-components/src/Containers/Sidebar/index.module.css
index a56bed69bf94b..b9a5c3595664d 100644
--- a/packages/ui-components/src/Containers/Sidebar/index.module.css
+++ b/packages/ui-components/src/Containers/Sidebar/index.module.css
@@ -5,7 +5,6 @@
     ml:overflow-auto
     ml:border-r
     scrollbar-thin
-    ml:pb-[var(--header-height)]
     z-0
     flex
     w-full