diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/DevToolsHelper.cs b/src/mono/wasm/debugger/BrowserDebugProxy/DevToolsHelper.cs
index 8f4cfa9ca69b52..7c356d31a918b4 100644
--- a/src/mono/wasm/debugger/BrowserDebugProxy/DevToolsHelper.cs
+++ b/src/mono/wasm/debugger/BrowserDebugProxy/DevToolsHelper.cs
@@ -515,14 +515,22 @@ public ExecutionContext GetCurrentContext(SessionId sessionId)
                 ? context
                 : throw new KeyNotFoundException($"No execution context found for session {sessionId}");
 
-        public bool TryGetCurrentExecutionContextValue(SessionId id, out ExecutionContext executionContext)
+        public bool TryGetCurrentExecutionContextValue(SessionId id, out ExecutionContext executionContext, bool ignoreDestroyedContext = true)
         {
             executionContext = null;
             if (!contexts.TryGetValue(id, out ConcurrentBag<ExecutionContext> contextBag))
                 return false;
             if (contextBag.IsEmpty)
                 return false;
-            executionContext = contextBag.Where(context => context.Id == contextBag.Where(context => context.Destroyed == false).Max(context => context.Id)).FirstOrDefault();
+            IEnumerable<ExecutionContext> validContexts = null;
+            if (ignoreDestroyedContext)
+                validContexts = contextBag.Where(context => context.Destroyed == false);
+            else
+                validContexts = contextBag;
+            if (!validContexts.Any())
+                return false;
+            int maxId = validContexts.Max(context => context.Id);
+            executionContext = contextBag.FirstOrDefault(context => context.Id == maxId);
             return executionContext != null;
         }
 
@@ -540,7 +548,7 @@ public void OnDefaultContextUpdate(SessionId sessionId, ExecutionContext newCont
 
         public bool TryGetAndAddContext(SessionId sessionId, ExecutionContext newExecutionContext, out ExecutionContext previousExecutionContext)
         {
-            bool hasExisting = TryGetCurrentExecutionContextValue(sessionId, out previousExecutionContext);
+            bool hasExisting = TryGetCurrentExecutionContextValue(sessionId, out previousExecutionContext, ignoreDestroyedContext: false);
             ConcurrentBag<ExecutionContext> bag = contexts.GetOrAdd(sessionId, _ => new ConcurrentBag<ExecutionContext>());
             bag.Add(newExecutionContext);
             return hasExisting;
@@ -569,6 +577,13 @@ public void DestroyContext(SessionId sessionId, int id)
             foreach (ExecutionContext context in contextBag.Where(x => x.Id == id).ToList())
                 context.Destroyed = true;
         }
+        public void ClearContexts(SessionId sessionId)
+        {
+            if (!contexts.TryGetValue(sessionId, out ConcurrentBag<ExecutionContext> contextBag))
+                return;
+            foreach (ExecutionContext context in contextBag)
+                context.Destroyed = true;
+        }
         public bool ContainsKey(SessionId sessionId) => contexts.ContainsKey(sessionId);
     }
 }
diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs b/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs
index 7f73ab33430d2a..3eb360ca2ad186 100644
--- a/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs
+++ b/src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs
@@ -142,6 +142,11 @@ protected override async Task<bool> AcceptEvent(SessionId sessionId, JObject par
                         Contexts.DestroyContext(sessionId, args["executionContextId"].Value<int>());
                         return false;
                     }
+                case "Runtime.executionContextsCleared":
+                    {
+                        Contexts.ClearContexts(sessionId);
+                        return false;
+                    }
 
                 case "Debugger.paused":
                     {
@@ -1541,7 +1546,17 @@ internal virtual async Task OnSourceFileAdded(SessionId sessionId, SourceFile so
             {
                 if (req.TryResolve(source))
                 {
-                    await SetBreakpoint(sessionId, context.store, req, true, false, token);
+                    try
+                    {
+                        await SetBreakpoint(sessionId, context.store, req, true, false, token);
+                    }
+                    catch (DebuggerAgentException e)
+                    {
+                        //it's not a wasm page then the command throws an error
+                        if (!e.Message.Contains("getDotnetRuntime is not defined"))
+                            logger.LogDebug($"Unexpected error on RuntimeReady {e}");
+                        return;
+                    }
                 }
             }
         }