diff --git a/com.unity.netcode.gameobjects/CHANGELOG.md b/com.unity.netcode.gameobjects/CHANGELOG.md
index 1d5c8517d7..dd36227e32 100644
--- a/com.unity.netcode.gameobjects/CHANGELOG.md
+++ b/com.unity.netcode.gameobjects/CHANGELOG.md
@@ -28,6 +28,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
 - Fixed NetworkObjects not being despawned before they are destroyed during shutdown for client, host, and server instances. (#1390)
 - Fixed KeyNotFound exception when removing ownership of a newly spawned NetworkObject that is already owned by the server. (#1500)
 - Fixed issue where pooled NetworkObjects using NetworkTransform would interpolate from their last de-spawned position to the newly spawned position (#1505)
+- Fixed NetworkManager.LocalClient not being set when starting as a host. (#1511)
 
 ### Changed
 
diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs
index 22c15163b5..097d9bbe0b 100644
--- a/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs
@@ -1636,6 +1636,7 @@ internal void HandleApproval(ulong ownerClientId, bool createPlayerObject, uint?
                 }
                 else // Server just adds itself as an observer to all spawned NetworkObjects
                 {
+                    LocalClient = client;
                     SpawnManager.UpdateObservedNetworkObjects(ownerClientId);
                     InvokeOnClientConnectedCallback(ownerClientId);
                 }
diff --git a/testproject/Assets/Tests/Runtime/NetworkManagerTests.cs b/testproject/Assets/Tests/Runtime/NetworkManagerTests.cs
new file mode 100644
index 0000000000..dc1a8dcfdc
--- /dev/null
+++ b/testproject/Assets/Tests/Runtime/NetworkManagerTests.cs
@@ -0,0 +1,16 @@
+using NUnit.Framework;
+using Unity.Netcode.RuntimeTests;
+
+namespace TestProject.RuntimeTests
+{
+    public class NetworkManagerTests : BaseMultiInstanceTest
+    {
+        protected override int NbClients => 1;
+
+        [Test]
+        public void ValidateHostLocalClient()
+        {
+            Assert.IsTrue(m_ServerNetworkManager.LocalClient != null);
+        }
+    }
+}
diff --git a/testproject/Assets/Tests/Runtime/NetworkManagerTests.cs.meta b/testproject/Assets/Tests/Runtime/NetworkManagerTests.cs.meta
new file mode 100644
index 0000000000..e9b6fb5226
--- /dev/null
+++ b/testproject/Assets/Tests/Runtime/NetworkManagerTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2642ec8067a2f5b4e8133eaab43e4b7a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
\ No newline at end of file