diff --git a/Facepunch.Steamworks.Test/Facepunch.Steamworks.Test.csproj b/Facepunch.Steamworks.Test/Facepunch.Steamworks.Test.csproj
index 891970f..d60fc27 100644
--- a/Facepunch.Steamworks.Test/Facepunch.Steamworks.Test.csproj
+++ b/Facepunch.Steamworks.Test/Facepunch.Steamworks.Test.csproj
@@ -94,6 +94,7 @@
   <ItemGroup>
     <Compile Include="Client\Achievements.cs" />
     <Compile Include="Client\Client.cs" />
+    <Compile Include="Client\Lobby.cs" />
     <Compile Include="Client\RichPresence.cs" />
     <Compile Include="Client\Leaderboard.cs" />
     <Compile Include="Client\App.cs" />
diff --git a/Facepunch.Steamworks/Client/Lobby.cs b/Facepunch.Steamworks/Client/Lobby.cs
index 1d20130..8f7e09e 100644
--- a/Facepunch.Steamworks/Client/Lobby.cs
+++ b/Facepunch.Steamworks/Client/Lobby.cs
@@ -415,19 +415,18 @@ namespace Facepunch.Steamworks
         {
             get
             {
-                if (_owner == 0 && IsValid)
+                if (IsValid)
                 {
-                    _owner = client.native.matchmaking.GetLobbyOwner(CurrentLobby);
+                    return client.native.matchmaking.GetLobbyOwner(CurrentLobby);
                 }
-                return _owner;
+                return 0;
             }
-            private set
+            set
             {
-                if (_owner == value) return;
-                if (client.native.matchmaking.SetLobbyOwner(CurrentLobby, value)) { _owner = value; }
+                if (Owner == value) return;
+                client.native.matchmaking.SetLobbyOwner(CurrentLobby, value);
             }
         }
-        ulong _owner = 0;
 
         /// <summary>
         /// Is the Lobby joinable by other people? Defaults to true;
@@ -490,7 +489,6 @@ namespace Facepunch.Steamworks
         {
             if (CurrentLobby != 0) { client.native.matchmaking.LeaveLobby(CurrentLobby); }
             CurrentLobby = 0;
-            _owner = 0;
             CurrentLobbyData = null;
         }