diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
index a2066e62..b3ee4112 100644
--- a/src/wallet/api/wallet.cpp
+++ b/src/wallet/api/wallet.cpp
@@ -129,7 +129,7 @@ string Wallet::displayAmount(uint64_t amount)
 
 uint64_t Wallet::amountFromString(const string &amount)
 {
-    uint64_t result;
+    uint64_t result = 0;
     cryptonote::parse_amount(result, amount);
     return result;
 }
diff --git a/tests/libwallet_api_tests/main.cpp b/tests/libwallet_api_tests/main.cpp
index f4ef5dbe..4d09ffb1 100644
--- a/tests/libwallet_api_tests/main.cpp
+++ b/tests/libwallet_api_tests/main.cpp
@@ -213,6 +213,26 @@ TEST_F(WalletManagerTest, WalletManagerOpensWallet)
 }
 
 
+TEST_F(WalletManagerTest, WalletMaxAmountAsString)
+{
+    LOG_PRINT_L3("max amount: " << Bitmonero::Wallet::displayAmount(
+                     Bitmonero::Wallet::maximumAllowedAmount()));
+
+}
+
+TEST_F(WalletManagerTest, WalletAmountFromString)
+{
+    uint64_t amount = Bitmonero::Wallet::amountFromString("18446740");
+    ASSERT_TRUE(amount > 0);
+    amount = Bitmonero::Wallet::amountFromString("11000000000000");
+    ASSERT_FALSE(amount > 0);
+    amount = Bitmonero::Wallet::amountFromString("0.0");
+    ASSERT_FALSE(amount > 0);
+    amount = Bitmonero::Wallet::amountFromString("10.1");
+    ASSERT_TRUE(amount > 0);
+
+}
+
 void open_wallet(Bitmonero::WalletManager *wmgr, Bitmonero::Wallet **wallet, const std::string &pass, std::mutex *mutex)
 {
     if (mutex)
@@ -226,6 +246,9 @@ void open_wallet(Bitmonero::WalletManager *wmgr, Bitmonero::Wallet **wallet, con
         mutex->unlock();
 }
 
+
+
+
 //TEST_F(WalletManagerTest, WalletManagerOpensWalletWithPasswordAndReopenMultiThreaded)
 //{
 //    // create password protected wallet