diff --git a/Content.Server/GameTicking/GameTicker.Player.cs b/Content.Server/GameTicking/GameTicker.Player.cs
index 2bb96f3905..f2635c6a9a 100644
--- a/Content.Server/GameTicking/GameTicker.Player.cs
+++ b/Content.Server/GameTicking/GameTicker.Player.cs
@@ -65,8 +65,6 @@ namespace Content.Server.GameTicking
                     // Sunrise-Queue-Start
                     if (!IoCManager.Instance!.TryResolveType<IServerJoinQueueManager>(out _))
                         Timer.Spawn(0, () => _playerManager.JoinGame(args.Session));
-                    else
-                        _userDb.ClientConnected(session);
                     // Sunrise-Queue-End
 
                     var record = await _db.GetPlayerRecordByUserId(args.Session.UserId);
@@ -109,10 +107,7 @@ namespace Content.Server.GameTicking
 
                 case SessionStatus.InGame:
                 {
-                    // Sunrise-Queue-Start
-                    if (!IoCManager.Instance!.TryResolveType<IServerJoinQueueManager>(out _))
-                        _userDb.ClientConnected(session);
-                    // Sunrise-Queue-End
+                    _userDb.ClientConnected(session);
 
                     if (mind == null)
                     {
diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
index a245f5cb2f..bdc9b1597b 100644
--- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
+++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
@@ -406,7 +406,7 @@ public sealed class PlayTimeTrackingManager : ISharedPlaytimeManager, IPostInjec
 
     public Dictionary<string, TimeSpan> GetTrackerTimes(ICommonSession id)
     {
-        if (!_playTimeData.TryGetValue(id.UserId, out var data) || !data.Initialized) // Sunrise-Edit
+        if (!_playTimeData.TryGetValue(id.UserId, out var data) || !data.Initialized)
             throw new InvalidOperationException("Play time info is not yet loaded for this player!");
 
         return data.TrackerTimes;