diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd4efc51c1..fb9ef47088 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,13 +13,15 @@ the release.
   ([#2614](https://github.com/open-telemetry/opentelemetry-demo/pull/2614))
 * [grafana] Update grafana version to 12.2.0
   ([#2615](https://github.com/open-telemetry/opentelemetry-demo/pull/2615))
+* [chore] Upgrade OpenFeature and add fix deprecation warnings for dependency
+  injection
+  ([#2644](https://github.com/open-telemetry/opentelemetry-demo/pull/2644))
 * [frontend] Fix navigation and cart math
   ([#2660](https://github.com/open-telemetry/opentelemetry-demo/pull/2660))
 * [feat] Add Product Review service with AI-generated summaries
   ([#2663](https://github.com/open-telemetry/opentelemetry-demo/pull/2663))
-* [chore] Upgrade OpenFeature and add fix deprecation warnings for dependency
-  injection
-  ([#2644](https://github.com/open-telemetry/opentelemetry-demo/pull/2644))
+* [chore] Fix flagd-ui span error
+  ([#2677](https://github.com/open-telemetry/opentelemetry-demo/pull/2677))
 * [frontend] fix item calculation and shipping
   ([#2684](https://github.com/open-telemetry/opentelemetry-demo/pull/2684))
 
diff --git a/src/flagd-ui/assets/js/app.js b/src/flagd-ui/assets/js/app.js
index f45314c34d..fab5748f42 100644
--- a/src/flagd-ui/assets/js/app.js
+++ b/src/flagd-ui/assets/js/app.js
@@ -63,4 +63,3 @@ if (process.env.NODE_ENV === "development") {
     window.liveReloader = reloader
   })
 }
-
diff --git a/src/otel-collector/otelcol-config.yml b/src/otel-collector/otelcol-config.yml
index bb4a33f777..5e0f1a3f15 100644
--- a/src/otel-collector/otelcol-config.yml
+++ b/src/otel-collector/otelcol-config.yml
@@ -150,6 +150,7 @@ processors:
           # could be removed when https://github.com/vercel/next.js/pull/64852 is fixed upstream
           - replace_pattern(name, "\\?.*", "")
           - replace_match(name, "GET /api/products/*", "GET /api/products/{productId}")
+          - set(span.status.code, STATUS_CODE_UNSET) where span.attributes["http.status_code"] == 101
 
 connectors:
   spanmetrics: