diff --git a/test/NodeGuard.Tests/Jobs/MonitorRebalancesJobTests.cs b/test/NodeGuard.Tests/Jobs/MonitorRebalancesJobTests.cs
new file mode 100644
index 00000000..102f00b5
--- /dev/null
+++ b/test/NodeGuard.Tests/Jobs/MonitorRebalancesJobTests.cs
@@ -0,0 +1,243 @@
+/*
+ * NodeGuard
+ * Copyright (C) 2023  Elenpay
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+using FluentAssertions;
+using Lnrpc;
+using Microsoft.Extensions.Logging;
+using NodeGuard.Data.Models;
+using NodeGuard.Data.Repositories.Interfaces;
+using NodeGuard.Services;
+using Quartz;
+
+namespace NodeGuard.Jobs;
+
+public class MonitorRebalancesJobTests
+{
+    private readonly Mock<ILogger<MonitorRebalancesJob>> _logger = new();
+    private readonly Mock<IRebalanceRepository> _rebalanceRepo = new();
+    private readonly Mock<ILightningService> _lightning = new();
+    private readonly Mock<IAuditService> _audit = new();
+    private readonly Mock<IJobExecutionContext> _ctx = new();
+
+    private MonitorRebalancesJob CreateJob() => new(
+        _logger.Object,
+        _rebalanceRepo.Object,
+        _lightning.Object,
+        _audit.Object);
+
+    private static Node Node(int id = 1) => new()
+    {
+        Id = id,
+        Name = $"node-{id}",
+        Endpoint = "localhost:10009",
+        ChannelAdminMacaroon = "mac",
+        PubKey = "030000000000000000000000000000000000000000000000000000000000000001",
+    };
+
+    private static Rebalance MakeRebalance(RebalanceStatus status, string? hashHex = "abcdef01", Node? node = null)
+        => new()
+        {
+            Id = 42,
+            NodeId = node?.Id ?? 1,
+            Node = node ?? Node(),
+            Status = status,
+            PaymentHashHex = hashHex,
+            SatsAmount = 100_000,
+            RequestedAmountSats = 100_000,
+            MaxFeePct = 0.05,
+        };
+
+    [Fact]
+    public async Task Execute_InFlight_LndSucceeded_RowFlipsToSucceededAndAudits()
+    {
+        var reb = MakeRebalance(RebalanceStatus.InFlight);
+        _rebalanceRepo.Setup(r => r.GetReconcilable(It.IsAny<TimeSpan>())).ReturnsAsync(new List<Rebalance> { reb });
+        _lightning.Setup(x => x.TrackPaymentV2Async(It.IsAny<Node>(), It.IsAny<byte[]>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new Payment
+            {
+                Status = Payment.Types.PaymentStatus.Succeeded,
+                FeeMsat = 12_345,
+                PaymentPreimage = "deadbeef",
+            });
+
+        await CreateJob().Execute(_ctx.Object);
+
+        reb.Status.Should().Be(RebalanceStatus.Succeeded);
+        reb.FeePaidMsat.Should().Be(12_345);
+        reb.PreimageHex.Should().Be("deadbeef");
+        _rebalanceRepo.Verify(r => r.Update(reb), Times.Once);
+        _audit.Verify(a => a.LogSystemAsync(
+                AuditActionType.RebalanceCompleted, AuditEventType.Success,
+                AuditObjectType.Rebalance, reb.Id.ToString(), It.IsAny<object>()),
+            Times.Once);
+    }
+
+    [Fact]
+    public async Task Execute_RecentlyFailed_LndSucceeded_RowCorrectedToSucceeded()
+    {
+        // The core bug-fix case: catch-block wrongly marked it Failed, LND actually settled.
+        var reb = MakeRebalance(RebalanceStatus.Failed);
+        _rebalanceRepo.Setup(r => r.GetReconcilable(It.IsAny<TimeSpan>())).ReturnsAsync(new List<Rebalance> { reb });
+        _lightning.Setup(x => x.TrackPaymentV2Async(It.IsAny<Node>(), It.IsAny<byte[]>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new Payment
+            {
+                Status = Payment.Types.PaymentStatus.Succeeded,
+                FeeMsat = 5_000,
+                PaymentPreimage = "cafebabe",
+            });
+
+        await CreateJob().Execute(_ctx.Object);
+
+        reb.Status.Should().Be(RebalanceStatus.Succeeded);
+        reb.PreimageHex.Should().Be("cafebabe");
+        _audit.Verify(a => a.LogSystemAsync(
+                AuditActionType.RebalanceCompleted, AuditEventType.Success,
+                AuditObjectType.Rebalance, reb.Id.ToString(), It.IsAny<object>()),
+            Times.Once);
+    }
+
+    [Fact]
+    public async Task Execute_InFlight_LndFailedNoRoute_RowFlipsToNoRoute()
+    {
+        var reb = MakeRebalance(RebalanceStatus.InFlight);
+        _rebalanceRepo.Setup(r => r.GetReconcilable(It.IsAny<TimeSpan>())).ReturnsAsync(new List<Rebalance> { reb });
+        _lightning.Setup(x => x.TrackPaymentV2Async(It.IsAny<Node>(), It.IsAny<byte[]>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new Payment
+            {
+                Status = Payment.Types.PaymentStatus.Failed,
+                FailureReason = PaymentFailureReason.FailureReasonNoRoute,
+            });
+
+        await CreateJob().Execute(_ctx.Object);
+
+        reb.Status.Should().Be(RebalanceStatus.NoRoute);
+        _audit.Verify(a => a.LogSystemAsync(
+                AuditActionType.RebalanceCompleted, AuditEventType.Failure,
+                AuditObjectType.Rebalance, reb.Id.ToString(), It.IsAny<object>()),
+            Times.Once);
+    }
+
+    [Fact]
+    public async Task Execute_InFlight_LndNotFound_RowMarkedFailed()
+    {
+        // TrackPaymentV2Async returns null on StatusCode.NotFound. For non-terminal rows the
+        // monitor treats this as "LND never saw it" and flips them to Failed.
+        var reb = MakeRebalance(RebalanceStatus.InFlight);
+        _rebalanceRepo.Setup(r => r.GetReconcilable(It.IsAny<TimeSpan>())).ReturnsAsync(new List<Rebalance> { reb });
+        _lightning.Setup(x => x.TrackPaymentV2Async(It.IsAny<Node>(), It.IsAny<byte[]>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync((Payment?)null);
+
+        await CreateJob().Execute(_ctx.Object);
+
+        reb.Status.Should().Be(RebalanceStatus.Failed);
+        _rebalanceRepo.Verify(r => r.Update(reb), Times.Once);
+    }
+
+    [Fact]
+    public async Task Execute_RecentlyFailed_LndNotFound_RowLeftAlone()
+    {
+        // Track returning null for an already-terminal row is treated as "no LND truth" —
+        // we don't reopen a Failed row on transient errors.
+        var reb = MakeRebalance(RebalanceStatus.Failed);
+        _rebalanceRepo.Setup(r => r.GetReconcilable(It.IsAny<TimeSpan>())).ReturnsAsync(new List<Rebalance> { reb });
+        _lightning.Setup(x => x.TrackPaymentV2Async(It.IsAny<Node>(), It.IsAny<byte[]>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync((Payment?)null);
+
+        await CreateJob().Execute(_ctx.Object);
+
+        reb.Status.Should().Be(RebalanceStatus.Failed);
+        _rebalanceRepo.Verify(r => r.Update(It.IsAny<Rebalance>()), Times.Never);
+    }
+
+    [Fact]
+    public async Task Execute_LndStillInFlight_RowUntouched()
+    {
+        var reb = MakeRebalance(RebalanceStatus.InFlight);
+        _rebalanceRepo.Setup(r => r.GetReconcilable(It.IsAny<TimeSpan>())).ReturnsAsync(new List<Rebalance> { reb });
+        _lightning.Setup(x => x.TrackPaymentV2Async(It.IsAny<Node>(), It.IsAny<byte[]>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new Payment { Status = Payment.Types.PaymentStatus.InFlight });
+
+        await CreateJob().Execute(_ctx.Object);
+
+        reb.Status.Should().Be(RebalanceStatus.InFlight);
+        _rebalanceRepo.Verify(r => r.Update(It.IsAny<Rebalance>()), Times.Never);
+    }
+
+    [Fact]
+    public async Task Execute_StatusUnchanged_DoesNotUpdateOrAudit()
+    {
+        // LND confirms the same status the DB already has — no need to write or audit.
+        var reb = MakeRebalance(RebalanceStatus.Failed);
+        _rebalanceRepo.Setup(r => r.GetReconcilable(It.IsAny<TimeSpan>())).ReturnsAsync(new List<Rebalance> { reb });
+        _lightning.Setup(x => x.TrackPaymentV2Async(It.IsAny<Node>(), It.IsAny<byte[]>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new Payment
+            {
+                Status = Payment.Types.PaymentStatus.Failed,
+                FailureReason = PaymentFailureReason.FailureReasonError,
+            });
+
+        await CreateJob().Execute(_ctx.Object);
+
+        reb.Status.Should().Be(RebalanceStatus.Failed);
+        _rebalanceRepo.Verify(r => r.Update(It.IsAny<Rebalance>()), Times.Never);
+        _audit.Verify(a => a.LogSystemAsync(
+                It.IsAny<AuditActionType>(), It.IsAny<AuditEventType>(),
+                It.IsAny<AuditObjectType>(), It.IsAny<string>(), It.IsAny<object>()),
+            Times.Never);
+    }
+
+    [Fact]
+    public async Task Execute_PerRowExceptionDoesNotAbortOthers()
+    {
+        // One row's TrackPaymentV2 throws; the other should still be reconciled.
+        var failing = MakeRebalance(RebalanceStatus.InFlight, hashHex: "11111111");
+        failing.Id = 1;
+        var succeeding = MakeRebalance(RebalanceStatus.InFlight, hashHex: "22222222");
+        succeeding.Id = 2;
+
+        _rebalanceRepo.Setup(r => r.GetReconcilable(It.IsAny<TimeSpan>()))
+            .ReturnsAsync(new List<Rebalance> { failing, succeeding });
+
+        _lightning.Setup(x => x.TrackPaymentV2Async(It.IsAny<Node>(),
+                It.Is<byte[]>(b => b.Length == 4 && b[0] == 0x11),
+                It.IsAny<CancellationToken>()))
+            .ThrowsAsync(new InvalidOperationException("boom"));
+        _lightning.Setup(x => x.TrackPaymentV2Async(It.IsAny<Node>(),
+                It.Is<byte[]>(b => b.Length == 4 && b[0] == 0x22),
+                It.IsAny<CancellationToken>()))
+            .ReturnsAsync(new Payment { Status = Payment.Types.PaymentStatus.Succeeded, FeeMsat = 1000, PaymentPreimage = "aa" });
+
+        await CreateJob().Execute(_ctx.Object);
+
+        succeeding.Status.Should().Be(RebalanceStatus.Succeeded);
+    }
+
+    [Fact]
+    public async Task Execute_MalformedHashHex_SkipsRow()
+    {
+        var reb = MakeRebalance(RebalanceStatus.InFlight, hashHex: "not-hex!!");
+        _rebalanceRepo.Setup(r => r.GetReconcilable(It.IsAny<TimeSpan>())).ReturnsAsync(new List<Rebalance> { reb });
+
+        await CreateJob().Execute(_ctx.Object);
+
+        _lightning.Verify(x => x.TrackPaymentV2Async(It.IsAny<Node>(), It.IsAny<byte[]>(), It.IsAny<CancellationToken>()),
+            Times.Never);
+        reb.Status.Should().Be(RebalanceStatus.InFlight);
+    }
+}
diff --git a/test/NodeGuard.Tests/Services/RebalanceServiceTests.cs b/test/NodeGuard.Tests/Services/RebalanceServiceTests.cs
index 7dac1f10..3b6e0ca8 100644
--- a/test/NodeGuard.Tests/Services/RebalanceServiceTests.cs
+++ b/test/NodeGuard.Tests/Services/RebalanceServiceTests.cs
@@ -286,6 +286,46 @@ public async Task ExecuteAsync_ProbeSucceeds_PaymentSucceeds_StatusSucceeded()
         result.PreimageHex.Should().Be("deadbeef");
     }
 
+    [Fact]
+    public async Task ExecuteAsync_PersistsPaymentHashHexBeforePayment()
+    {
+        // The monitor job depends on the payment hash being on the row before SendPaymentV2 is
+        // dispatched — otherwise a process crash mid-stream leaves nothing for the
+        // reconciliation lookup to use.
+        var node = CreateNode();
+        _nodeRepo.Setup(x => x.GetById(node.Id, It.IsAny<bool>())).ReturnsAsync(node);
+        StubRepoForCapture();
+
+        var hashBytes = new byte[] { 0xAB, 0xCD, 0xEF, 0x01 };
+        _lightning.Setup(x => x.AddInvoiceAsync(node, It.IsAny<long>(), It.IsAny<string>(), It.IsAny<long>()))
+            .ReturnsAsync(new AddInvoiceResponse
+            {
+                PaymentRequest = "lnbc...",
+                RHash = Google.Protobuf.ByteString.CopyFrom(hashBytes),
+            });
+
+        string? hashAtProbeTime = null;
+        _lightning.Setup(x => x.ProbeRouteAsync(node, It.IsAny<long>(), It.IsAny<long>(),
+                It.IsAny<ulong?>(), It.IsAny<string?>(), It.IsAny<double>(), It.IsAny<CancellationToken>()))
+            .Callback<Node, long, long, ulong?, string?, double, CancellationToken>((_, _, _, _, _, _, _) =>
+            {
+                // By the time the probe is invoked, the hash must already be on the row.
+                var captured = _rebalanceRepo.Invocations
+                    .Where(i => i.Method.Name == nameof(IRebalanceRepository.Update))
+                    .Select(i => (Rebalance)i.Arguments[0])
+                    .LastOrDefault();
+                hashAtProbeTime = captured?.PaymentHashHex;
+            })
+            .ReturnsAsync(new ProbeResult.NoRoute("test"));
+
+        var service = CreateService();
+        var request = new RebalanceRequest(node.Id, null, null, 100_000, MaxFeePct: 0.05);
+        var result = await service.RebalanceAsync(request);
+
+        result.PaymentHashHex.Should().Be("abcdef01");
+        hashAtProbeTime.Should().Be("abcdef01");
+    }
+
     [Fact]
     public async Task ExecuteAsync_ProbeNoRoute_StatusNoRoute_RetryScheduled()
     {