diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs
index 8fabac4..03d24d6 100644
--- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs
@@ -98,16 +98,23 @@ namespace MareSynchronosServer.Hubs
 
                 _logger.LogInformation("Disconnect from " + AuthenticatedUserId);
 
-                var otherUsers = await _dbContext.ClientPairs.AsNoTracking()
-                    .Include(u => u.OtherUser)
-                    .Where(self => self.UserUID == user.UID && !self.IsPaused && self.OtherUser.CharacterIdentification != null)
-                    .Select(e => e.OtherUserUID)
-                    .ToListAsync();
+                var query =
+                    from userToOther in _dbContext.ClientPairs
+                    join otherToUser in _dbContext.ClientPairs
+                        on new {
+                            user = userToOther.UserUID,
+                            other = userToOther.OtherUserUID
 
-                var otherEntries = await _dbContext.ClientPairs.AsNoTracking()
-                    .Where(other => otherUsers.Contains(other.UserUID) && other.OtherUserUID == user.UID && !other.IsPaused)
-                    .Select(u => u.UserUID)
-                    .ToListAsync();
+                        } equals new {
+                            user = otherToUser.OtherUserUID,
+                            other = otherToUser.UserUID
+                        }
+                    where
+                        userToOther.UserUID == user.UID
+                        && !userToOther.IsPaused
+                        && !otherToUser.IsPaused
+                    select otherToUser.UserUID;
+                var otherEntries = await query.ToListAsync();
 
                 await Clients.Users(otherEntries).SendAsync(Api.OnUserRemoveOnlinePairedPlayer, user.CharacterIdentification);
 
diff --git a/MareSynchronosServer/MareSynchronosServerTest/Discord/DiscordBotTest.cs b/MareSynchronosServer/MareSynchronosServerTest/Discord/DiscordBotTest.cs
index fe66a66..6a6cb47 100644
--- a/MareSynchronosServer/MareSynchronosServerTest/Discord/DiscordBotTest.cs
+++ b/MareSynchronosServer/MareSynchronosServerTest/Discord/DiscordBotTest.cs
@@ -31,7 +31,7 @@ namespace MareSynchronosServerTest.Discord {
         [TestCase("https://eu.finalfantasyxiv.com/lodestone/character/1234?myurlparameter=500", 1234)]
         [TestCase("https://de.finalfantasyxiv.com/lodestone/character/1234/whatever/3456", 1234)]
         [TestCase("https://na.finalfantasyxiv.com/lodestone/character/1234abcd4321/whatever/3456", 1234)]
-        public void Test1(string url, int? expectedId) {
+        public void ParseCharacterIdFromLodestoneUrl_CheckThatIdIsParsedCorrectly(string url, int? expectedId) {
             var inMemorySettings = new Dictionary<string, string> {
                 {"DiscordBotToken", "1234"}
             };
diff --git a/MareSynchronosServer/MareSynchronosServerTest/Hubs/MareHubTest.cs b/MareSynchronosServer/MareSynchronosServerTest/Hubs/MareHubTest.cs
new file mode 100644
index 0000000..e51407a
--- /dev/null
+++ b/MareSynchronosServer/MareSynchronosServerTest/Hubs/MareHubTest.cs
@@ -0,0 +1,82 @@
+using MareSynchronosServer.Data;
+using MareSynchronosServer.Hubs;
+using MareSynchronosServer.Models;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using Moq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MareSynchronosServerTest.Hubs {
+    public class MareHubTest {
+
+        [Test]
+        public async Task Disconnect_QueryReturnsCorrectResult_Test() {
+            var options = new DbContextOptionsBuilder<MareDbContext>()
+                .UseInMemoryDatabase(databaseName: "mare").Options;
+
+            using var context = new MareDbContext(options);
+            context.Users.Add(new User() { UID = "User1", IsModerator = false, IsAdmin = false, CharacterIdentification = "Ident1" });
+            context.Users.Add(new User() { UID = "User2", IsModerator = false, IsAdmin = false, CharacterIdentification = "Ident2" });
+            context.Users.Add(new User() { UID = "User3", IsModerator = false, IsAdmin = false, CharacterIdentification = "Ident3" });
+            context.Users.Add(new User() { UID = "User4", IsModerator = false, IsAdmin = false, CharacterIdentification = "Ident4" });
+            context.Users.Add(new User() { UID = "User5", IsModerator = false, IsAdmin = false, CharacterIdentification = "Ident5" });
+            context.Users.Add(new User() { UID = "User6", IsModerator = false, IsAdmin = false, CharacterIdentification = "Ident6" });
+
+            // Valid pairs
+            context.ClientPairs.Add(new ClientPair() { UserUID = "User1", OtherUserUID = "User2", IsPaused = false });
+            context.ClientPairs.Add(new ClientPair() { UserUID = "User2", OtherUserUID = "User1", IsPaused = false });
+            context.ClientPairs.Add(new ClientPair() { UserUID = "User1", OtherUserUID = "User3", IsPaused = false });
+            context.ClientPairs.Add(new ClientPair() { UserUID = "User3", OtherUserUID = "User1", IsPaused = false });
+
+            // Other user paired but user not paired with current user
+            context.ClientPairs.Add(new ClientPair() { UserUID = "User4", OtherUserUID = "User1", IsPaused = false });
+
+            // Valid pair but user paused
+            context.ClientPairs.Add(new ClientPair() { UserUID = "User1", OtherUserUID = "User5", IsPaused = true });
+            context.ClientPairs.Add(new ClientPair() { UserUID = "User5", OtherUserUID = "User1", IsPaused = false });
+
+            // Valid pair but other user paused
+            context.ClientPairs.Add(new ClientPair() { UserUID = "User1", OtherUserUID = "User6", IsPaused = false });
+            context.ClientPairs.Add(new ClientPair() { UserUID = "User6", OtherUserUID = "User1", IsPaused = true });
+
+            // Non existant user
+            context.ClientPairs.Add(new ClientPair() { UserUID = "User99", OtherUserUID = "User1", IsPaused = false });
+
+            // Non-related data
+            context.ClientPairs.Add(new ClientPair() { UserUID = "User6", OtherUserUID = "User4", IsPaused = true });
+            context.ClientPairs.Add(new ClientPair() { UserUID = "User4", OtherUserUID = "User3", IsPaused = false });
+            context.ClientPairs.Add(new ClientPair() { UserUID = "User3", OtherUserUID = "User2", IsPaused = false });
+
+            context.SaveChanges();
+
+            var clientContextMock = new Mock<HubCallerContext>();
+            var claimMock = new Mock<ClaimsPrincipal>();
+            var claim = new Claim(ClaimTypes.NameIdentifier, "User1");
+            claimMock.SetupGet(x => x.Claims).Returns(new List<Claim>() { claim });
+            clientContextMock.SetupGet(x => x.User).Returns(claimMock.Object);
+
+            var clientsMock = new Mock<IHubCallerClients>();
+            var clientProxyMock = new Mock<IClientProxy>();
+            clientsMock.Setup(x => x.Users(It.IsAny<IReadOnlyList<string>>())).Returns(clientProxyMock.Object);            
+
+            var hub = new MareHub(context, new Mock<ILogger<MareHub>>().Object, null, new Mock<IConfiguration>().Object, new Mock<IHttpContextAccessor>().Object);
+
+
+            hub.Clients = clientsMock.Object;
+            hub.Context = clientContextMock.Object;
+
+            await hub.OnDisconnectedAsync(new Exception("Test Exception"));
+
+            clientsMock.Verify(x => x.Users(It.Is<IReadOnlyList<string>>(x => x.Count() == 2 && x[0] == "User2" && x[1] == "User3")), Times.Once);
+            clientProxyMock.Verify(x => x.SendCoreAsync(It.IsAny<string>(), It.Is<object[]>(o => (string)o[0] == "Ident1"), It.IsAny<CancellationToken>()), Times.Once);
+        }
+    }
+}
diff --git a/MareSynchronosServer/MareSynchronosServerTest/MareSynchronosServerTest.csproj b/MareSynchronosServer/MareSynchronosServerTest/MareSynchronosServerTest.csproj
index 63087e2..732f04e 100644
--- a/MareSynchronosServer/MareSynchronosServerTest/MareSynchronosServerTest.csproj
+++ b/MareSynchronosServer/MareSynchronosServerTest/MareSynchronosServerTest.csproj
@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.7.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.8" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
     <PackageReference Include="Moq" Version="4.18.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />