diff --git a/packages/next/src/server/lib/router-utils/setup-dev.ts b/packages/next/src/server/lib/router-utils/setup-dev.ts
index 396508617d..1552000e57 100644
--- a/packages/next/src/server/lib/router-utils/setup-dev.ts
+++ b/packages/next/src/server/lib/router-utils/setup-dev.ts
@@ -754,6 +754,7 @@ async function startWatcher(opts: SetupOpts) {
               case 'server-component-reload-page': // { clientId }
               case 'client-reload-page': // { clientId }
               case 'client-full-reload': // { stackTrace, hadRuntimeError }
+              case 'span-end': // { startTime, endTime, spanName, attributes }
                 // TODO
                 break
 
@@ -775,7 +776,10 @@ async function startWatcher(opts: SetupOpts) {
                 break
 
               default:
-                throw new Error(`unrecognized Turbopack HMR message "${data}"`)
+                // Might have been a Next.js message...
+                if (!parsedData.event) {
+                  throw new Error(`unrecognized Turbopack message "${data}"`)
+                }
             }
           })
 
@@ -886,7 +890,7 @@ async function startWatcher(opts: SetupOpts) {
               page,
               await route.htmlEndpoint.writeToDisk()
             )
-            changeSubscription(page, route.htmlEndpoint, (pageName, change) => {
+            changeSubscription(page, route.dataEndpoint, (pageName, change) => {
               switch (change) {
                 case ServerClientChangeType.Server:
                 case ServerClientChangeType.Both:
@@ -939,7 +943,7 @@ async function startWatcher(opts: SetupOpts) {
           }
           case 'app-page': {
             await processResult(page, await route.htmlEndpoint.writeToDisk())
-            changeSubscription(page, route.htmlEndpoint, (_page, change) => {
+            changeSubscription(page, route.rscEndpoint, (_page, change) => {
               switch (change) {
                 case ServerClientChangeType.Server:
                 case ServerClientChangeType.Both: