diff --git a/LightlessSync/LightlessConfiguration/Configurations/LightlessConfig.cs b/LightlessSync/LightlessConfiguration/Configurations/LightlessConfig.cs
index b5cb97f..f90472a 100644
--- a/LightlessSync/LightlessConfiguration/Configurations/LightlessConfig.cs
+++ b/LightlessSync/LightlessConfiguration/Configurations/LightlessConfig.cs
@@ -78,6 +78,8 @@ public class LightlessConfig : ILightlessConfiguration
     public short LightfinderLabelOffsetX { get; set; } = 0;
     public short LightfinderLabelOffsetY { get; set; } = 0;
     public bool LightfinderLabelUseIcon { get; set; } = false;
+    public bool LightfinderLabelShowOwn { get; set; } = true;
+    public bool LightfinderLabelShowPaired { get; set; } = true;
     public string LightfinderLabelIconGlyph { get; set; } = SeIconCharExtensions.ToIconString(SeIconChar.LinkMarker);
     public float LightfinderLabelScale { get; set; } = 1.0f;
     public bool LightfinderAutoAlign { get; set; } = true;
diff --git a/LightlessSync/Plugin.cs b/LightlessSync/Plugin.cs
index 90ed4ae..c1648ca 100644
--- a/LightlessSync/Plugin.cs
+++ b/LightlessSync/Plugin.cs
@@ -208,7 +208,6 @@ public sealed class Plugin : IDalamudPlugin
             collection.AddSingleton<ConfigurationMigrator>();
             collection.AddSingleton<ConfigurationSaveService>();
             collection.AddSingleton<HubFactory>();
-            collection.AddSingleton<NameplateHandler>();
             collection.AddSingleton(s => new BroadcastScannerService( s.GetRequiredService<ILogger<BroadcastScannerService>>(), clientState, objectTable, framework, s.GetRequiredService<BroadcastService>(), s.GetRequiredService<LightlessMediator>(), s.GetRequiredService<NameplateHandler>(), s.GetRequiredService<DalamudUtilService>(), s.GetRequiredService<LightlessConfigService>()));
 
 
@@ -253,6 +252,8 @@ public sealed class Plugin : IDalamudPlugin
                 s.GetRequiredService<LightlessMediator>()));
             collection.AddScoped((s) => new NameplateService(s.GetRequiredService<ILogger<NameplateService>>(), s.GetRequiredService<LightlessConfigService>(), namePlateGui, clientState,
                 s.GetRequiredService<PairManager>(), s.GetRequiredService<LightlessMediator>()));
+            collection.AddScoped((s) => new NameplateHandler(s.GetRequiredService<ILogger<NameplateHandler>>(), addonLifecycle, gameGui, s.GetRequiredService<DalamudUtilService>(),
+                s.GetRequiredService<LightlessConfigService>(), s.GetRequiredService<LightlessMediator>(), clientState, s.GetRequiredService<PairManager>()));
 
             collection.AddHostedService(p => p.GetRequiredService<ConfigurationSaveService>());
             collection.AddHostedService(p => p.GetRequiredService<LightlessMediator>());
diff --git a/LightlessSync/Services/ContextMenuService.cs b/LightlessSync/Services/ContextMenuService.cs
index 12dae60..ad00514 100644
--- a/LightlessSync/Services/ContextMenuService.cs
+++ b/LightlessSync/Services/ContextMenuService.cs
@@ -158,6 +158,7 @@ internal class ContextMenuService : IHostedService
             _logger.LogError(ex, "Error sending pair request.");
         }
     }
+
     private HashSet<ulong> VisibleUserIds => [.. _pairManager.GetOnlineUserPairs()
             .Where(u => u.IsVisible && u.PlayerCharacterId != uint.MaxValue)
             .Select(u => (ulong)u.PlayerCharacterId)];
diff --git a/LightlessSync/Services/NameplateHandler.cs b/LightlessSync/Services/NameplateHandler.cs
index abe6266..969c494 100644
--- a/LightlessSync/Services/NameplateHandler.cs
+++ b/LightlessSync/Services/NameplateHandler.cs
@@ -7,6 +7,7 @@ using FFXIVClientStructs.FFXIV.Client.UI;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 using LightlessSync.LightlessConfiguration;
 using LightlessSync.LightlessConfiguration.Configurations;
+using LightlessSync.PlayerData.Pairs;
 using LightlessSync.Services.Mediator;
 using LightlessSync.UI;
 using LightlessSync.Utils;
@@ -25,8 +26,10 @@ public unsafe class NameplateHandler : IMediatorSubscriber
     private readonly ILogger<NameplateHandler> _logger;
     private readonly IAddonLifecycle _addonLifecycle;
     private readonly IGameGui _gameGui;
+    private readonly IClientState _clientState;
     private readonly DalamudUtilService _dalamudUtil;
     private readonly LightlessConfigService _configService;
+    private readonly PairManager _pairManager;
     private readonly LightlessMediator _mediator;
     public LightlessMediator Mediator => _mediator;
 
@@ -44,9 +47,9 @@ public unsafe class NameplateHandler : IMediatorSubscriber
     private const SeIconChar DefaultIcon = SeIconChar.LinkMarker;
     private static readonly string DefaultIconGlyph = SeIconCharExtensions.ToIconString(DefaultIcon);
 
-    private volatile HashSet<string> _activeBroadcastingCids = new();
+    private volatile HashSet<string> _activeBroadcastingCids = [];
 
-    public NameplateHandler(ILogger<NameplateHandler> logger, IAddonLifecycle addonLifecycle, IGameGui gameGui, DalamudUtilService dalamudUtil, LightlessConfigService configService, LightlessMediator mediator)
+    public NameplateHandler(ILogger<NameplateHandler> logger, IAddonLifecycle addonLifecycle, IGameGui gameGui, DalamudUtilService dalamudUtil, LightlessConfigService configService, LightlessMediator mediator, IClientState clientState, PairManager pairManager)
     {
         _logger = logger;
         _addonLifecycle = addonLifecycle;
@@ -54,6 +57,8 @@ public unsafe class NameplateHandler : IMediatorSubscriber
         _dalamudUtil = dalamudUtil;
         _configService = configService;
         _mediator = mediator;
+        _clientState = clientState;
+        _pairManager = pairManager;
 
         System.Array.Fill(_cachedNameplateTextOffsets, int.MinValue);
     }
@@ -218,14 +223,24 @@ public unsafe class NameplateHandler : IMediatorSubscriber
 
             var cid = DalamudUtilService.GetHashedCIDFromPlayerPointer((nint)objectInfo->GameObject);
 
-            //_logger.LogInformation($"checking cid: {cid}", cid);
-
             if (cid == null || !_activeBroadcastingCids.Contains(cid))
             {
                 pNode->AtkResNode.ToggleVisibility(false);
                 continue;
             }
 
+            if (!_configService.Current.LightfinderLabelShowOwn && (objectInfo->GameObject->GetGameObjectId() == _clientState.LocalPlayer.GameObjectId))
+            {
+                pNode->AtkResNode.ToggleVisibility(false);
+                continue;
+            }
+
+            if (!_configService.Current.LightfinderLabelShowPaired && VisibleUserIds.Any(u => u == objectInfo->GameObject->GetGameObjectId()))
+            {
+                pNode->AtkResNode.ToggleVisibility(false);
+                continue;
+            }
+
             var nameplateObject = mpNameplateAddon->NamePlateObjectArray[nameplateIndex];
             nameplateObject.RootComponentNode->Component->UldManager.UpdateDrawNodeList();
 
@@ -503,6 +518,9 @@ public unsafe class NameplateHandler : IMediatorSubscriber
         var nameplateObject = GetNameplateObject(i);
         return nameplateObject != null ? nameplateObject.Value.RootComponentNode : null;
     }
+    private HashSet<ulong> VisibleUserIds => [.. _pairManager.GetOnlineUserPairs()
+            .Where(u => u.IsVisible && u.PlayerCharacterId != uint.MaxValue)
+            .Select(u => (ulong)u.PlayerCharacterId)];
 
     public void FlagRefresh()
     {
diff --git a/LightlessSync/Services/NameplateService.cs b/LightlessSync/Services/NameplateService.cs
index f441a60..8ccc362 100644
--- a/LightlessSync/Services/NameplateService.cs
+++ b/LightlessSync/Services/NameplateService.cs
@@ -35,7 +35,6 @@ public class NameplateService : DisposableMediatorSubscriberBase
         _namePlateGui.OnNamePlateUpdate += OnNamePlateUpdate;
         _namePlateGui.RequestRedraw();
         Mediator.Subscribe<VisibilityChange>(this, (_) => _namePlateGui.RequestRedraw());
-
     }
 
     private void OnNamePlateUpdate(INamePlateUpdateContext context, IReadOnlyList<INamePlateUpdateHandler> handlers)
diff --git a/LightlessSync/UI/SettingsUi.cs b/LightlessSync/UI/SettingsUi.cs
index 58187a6..0a592f0 100644
--- a/LightlessSync/UI/SettingsUi.cs
+++ b/LightlessSync/UI/SettingsUi.cs
@@ -1144,6 +1144,26 @@ public class SettingsUi : WindowMediatorSubscriberBase
 
             }
 
+            var showOwn = _configService.Current.LightfinderLabelShowOwn;
+            if (ImGui.Checkbox("Show your own Lightfinder indicator", ref showOwn))
+            {
+                _configService.Current.LightfinderLabelShowOwn = showOwn;
+                _configService.Save();
+                _nameplateHandler.FlagRefresh();
+                _nameplateService.RequestRedraw();
+            }
+            _uiShared.DrawHelpText("Toggles your own Lightfinder indicator.");
+
+            var showPaired = _configService.Current.LightfinderLabelShowPaired;
+            if (ImGui.Checkbox("Show paired player(s) Lightfinder indicator", ref showPaired))
+            {
+                _configService.Current.LightfinderLabelShowPaired = showPaired;
+                _configService.Save();
+                _nameplateHandler.FlagRefresh();
+                _nameplateService.RequestRedraw();
+            }
+            _uiShared.DrawHelpText("Toggles paired player(s) Lightfinder indicator.");
+
             var useIcon = _configService.Current.LightfinderLabelUseIcon;
             if (ImGui.Checkbox("Show icon instead of text", ref useIcon))
             {