diff --git a/src/Microsoft.AspNetCore.Blazor.Browser/Rendering/BrowserRenderer.cs b/src/Microsoft.AspNetCore.Blazor.Browser/Rendering/BrowserRenderer.cs
index 550c019d1e..675fc29e3e 100644
--- a/src/Microsoft.AspNetCore.Blazor.Browser/Rendering/BrowserRenderer.cs
+++ b/src/Microsoft.AspNetCore.Blazor.Browser/Rendering/BrowserRenderer.cs
@@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.Blazor.Browser.Rendering
         /// <param name="serviceProvider">The <see cref="IServiceProvider"/> to use when initializing components.</param>
         public BrowserRenderer(IServiceProvider serviceProvider): base(serviceProvider)
         {
-            _browserRendererId = BrowserRendererRegistry.Add(this);
+            _browserRendererId = BrowserRendererRegistry.CurrentUserInstance.Add(this);
         }
 
         internal void DispatchBrowserEvent(int componentId, int eventHandlerId, UIEventArgs eventArgs)
@@ -79,7 +79,7 @@ namespace Microsoft.AspNetCore.Blazor.Browser.Rendering
         /// </summary>
         public void Dispose()
         {
-            BrowserRendererRegistry.TryRemove(_browserRendererId);
+            BrowserRendererRegistry.CurrentUserInstance.TryRemove(_browserRendererId);
         }
 
         /// <inheritdoc />
diff --git a/src/Microsoft.AspNetCore.Blazor.Browser/Rendering/BrowserRendererEventDispatcher.cs b/src/Microsoft.AspNetCore.Blazor.Browser/Rendering/BrowserRendererEventDispatcher.cs
index f005c4f96b..01ec744b84 100644
--- a/src/Microsoft.AspNetCore.Blazor.Browser/Rendering/BrowserRendererEventDispatcher.cs
+++ b/src/Microsoft.AspNetCore.Blazor.Browser/Rendering/BrowserRendererEventDispatcher.cs
@@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.Blazor.Browser.Rendering
             BrowserEventDescriptor eventDescriptor, string eventArgsJson)
         {
             var eventArgs = ParseEventArgsJson(eventDescriptor.EventArgsType, eventArgsJson);
-            var browserRenderer = BrowserRendererRegistry.Find(eventDescriptor.BrowserRendererId);
+            var browserRenderer = BrowserRendererRegistry.CurrentUserInstance.Find(eventDescriptor.BrowserRendererId);
             browserRenderer.DispatchBrowserEvent(
                 eventDescriptor.ComponentId,
                 eventDescriptor.EventHandlerId,
diff --git a/src/Microsoft.AspNetCore.Blazor.Browser/Rendering/BrowserRendererRegistry.cs b/src/Microsoft.AspNetCore.Blazor.Browser/Rendering/BrowserRendererRegistry.cs
index 805c772d44..a0aa2a3860 100644
--- a/src/Microsoft.AspNetCore.Blazor.Browser/Rendering/BrowserRendererRegistry.cs
+++ b/src/Microsoft.AspNetCore.Blazor.Browser/Rendering/BrowserRendererRegistry.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Collections.Generic;
@@ -12,18 +12,26 @@ namespace Microsoft.AspNetCore.Blazor.Browser.Rendering
     /// their associated component instances aren't GCed when events may still
     /// be received for them.
     /// </summary>
-    internal static class BrowserRendererRegistry
+    internal class BrowserRendererRegistry
     {
-        private static int _nextId;
-        private static IDictionary<int, BrowserRenderer> _browserRenderers
+        private int _nextId;
+        private IDictionary<int, BrowserRenderer> _browserRenderers
             = new Dictionary<int, BrowserRenderer>();
 
+        /// TODO: Don't have just one global static instance.
+        /// For multi-user scenarios, we need the current instance to be distinct for each user,
+        /// and ensure it's always set to that user's value whenever there are incoming JS interop
+        /// calls. We could store the value in the IServiceProvider but then we still need some way
+        /// of reaching the current user's IServiceProvider inside calls to .NET from JS interop.
+        internal static BrowserRendererRegistry CurrentUserInstance { get; }
+            = new BrowserRendererRegistry();
+
         /// <summary>
         /// Adds the <paramref name="browserRenderer"/> and gets a unique identifier for it.
         /// </summary>
         /// <param name="browserRenderer"></param>
         /// <returns>A unique identifier for the <paramref name="browserRenderer"/>.</returns>
-        public static int Add(BrowserRenderer browserRenderer)
+        public int Add(BrowserRenderer browserRenderer)
         {
             lock (_browserRenderers)
             {
@@ -39,7 +47,7 @@ namespace Microsoft.AspNetCore.Blazor.Browser.Rendering
         /// </summary>
         /// <param name="browserRendererId">The identifier of the instance to be returned.</param>
         /// <returns>The corresponding <see cref="BrowserRenderer"/> instance.</returns>
-        public static BrowserRenderer Find(int browserRendererId)
+        public BrowserRenderer Find(int browserRendererId)
         {
             lock (_browserRenderers)
             {
@@ -52,7 +60,7 @@ namespace Microsoft.AspNetCore.Blazor.Browser.Rendering
         /// </summary>
         /// <param name="browserRendererId">The identifier of the <see cref="BrowserRenderer"/> to remove.</param>
         /// <returns><see langword="true"/> if the <see cref="BrowserRenderer"/> was present; otherwise <see langword="false" />.</returns>
-        public static bool TryRemove(int browserRendererId)
+        public bool TryRemove(int browserRendererId)
         {
             lock (_browserRenderers)
             {