diff --git a/src/wallet/gtest/test_wallet.cpp b/src/wallet/gtest/test_wallet.cpp
index 18df6feff..ceea292d8 100644
--- a/src/wallet/gtest/test_wallet.cpp
+++ b/src/wallet/gtest/test_wallet.cpp
@@ -1061,21 +1061,21 @@ TEST(wallet_tests, NoteLocking) {
 
     // Test selective locking
     wallet.LockNote(jsoutpt);
-    EXPECT_TRUE(wallet.IsLockedNote(jsoutpt.hash, jsoutpt.js, jsoutpt.n));
-    EXPECT_FALSE(wallet.IsLockedNote(jsoutpt2.hash, jsoutpt2.js, jsoutpt2.n));
+    EXPECT_TRUE(wallet.IsLockedNote(jsoutpt));
+    EXPECT_FALSE(wallet.IsLockedNote(jsoutpt2));
 
     // Test selective unlocking
     wallet.UnlockNote(jsoutpt);
-    EXPECT_FALSE(wallet.IsLockedNote(jsoutpt.hash, jsoutpt.js, jsoutpt.n));
+    EXPECT_FALSE(wallet.IsLockedNote(jsoutpt));
 
     // Test multiple locking
     wallet.LockNote(jsoutpt);
     wallet.LockNote(jsoutpt2);
-    EXPECT_TRUE(wallet.IsLockedNote(jsoutpt.hash, jsoutpt.js, jsoutpt.n));
-    EXPECT_TRUE(wallet.IsLockedNote(jsoutpt2.hash, jsoutpt2.js, jsoutpt2.n));
+    EXPECT_TRUE(wallet.IsLockedNote(jsoutpt));
+    EXPECT_TRUE(wallet.IsLockedNote(jsoutpt2));
 
     // Test unlock all
     wallet.UnlockAllNotes();
-    EXPECT_FALSE(wallet.IsLockedNote(jsoutpt.hash, jsoutpt.js, jsoutpt.n));
-    EXPECT_FALSE(wallet.IsLockedNote(jsoutpt2.hash, jsoutpt2.js, jsoutpt2.n));
+    EXPECT_FALSE(wallet.IsLockedNote(jsoutpt));
+    EXPECT_FALSE(wallet.IsLockedNote(jsoutpt2));
 }
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 840b4aaf2..9aa4c4918 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3448,13 +3448,13 @@ void CWallet::ListLockedCoins(std::vector<COutPoint>& vOutpts)
 
 // Note Locking Operations
 
-void CWallet::LockNote(JSOutPoint& output)
+void CWallet::LockNote(const JSOutPoint& output)
 {
     AssertLockHeld(cs_wallet); // setLockedNotes
     setLockedNotes.insert(output);
 }
 
-void CWallet::UnlockNote(JSOutPoint& output)
+void CWallet::UnlockNote(const JSOutPoint& output)
 {
     AssertLockHeld(cs_wallet); // setLockedNotes
     setLockedNotes.erase(output);
@@ -3466,10 +3466,9 @@ void CWallet::UnlockAllNotes()
     setLockedNotes.clear();
 }
 
-bool CWallet::IsLockedNote(uint256 hash, size_t js, uint8_t n) const
+bool CWallet::IsLockedNote(const JSOutPoint& outpt) const
 {
     AssertLockHeld(cs_wallet); // setLockedNotes
-    JSOutPoint outpt(hash, js, n);
 
     return (setLockedNotes.count(outpt) > 0);
 }
@@ -3771,7 +3770,7 @@ void CWallet::GetFilteredNotes(
             }
             
             // skip locked notes
-            if (IsLockedNote(jsop.hash, jsop.js, jsop.n)) {
+            if (IsLockedNote(jsop)) {
                 continue;
             }
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index 6c05244e4..08f22f97e 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -165,7 +165,7 @@ public:
     uint8_t n;
 
     JSOutPoint() { SetNull(); }
-    JSOutPoint(uint256 h, size_t js, uint8_t n) : hash {h}, js {js}, n {n} { }
+    JSOutPoint(uint256 h, uint64_t js, uint8_t n) : hash {h}, js {js}, n {n} { }
 
     ADD_SERIALIZE_METHODS;
 
@@ -907,9 +907,9 @@ public:
     void ListLockedCoins(std::vector<COutPoint>& vOutpts);
 
 
-    bool IsLockedNote(uint256 hash, size_t js, uint8_t n) const;
-    void LockNote(JSOutPoint& output);
-    void UnlockNote(JSOutPoint& output);
+    bool IsLockedNote(const JSOutPoint& outpt) const;
+    void LockNote(const JSOutPoint& output);
+    void UnlockNote(const JSOutPoint& output);
     void UnlockAllNotes();
     std::vector<JSOutPoint> ListLockedNotes();