diff --git a/src/Angor/Client/Pages/View.razor b/src/Angor/Client/Pages/View.razor
index 662827ab..edbf0098 100644
--- a/src/Angor/Client/Pages/View.razor
+++ b/src/Angor/Client/Pages/View.razor
@@ -502,14 +502,15 @@ else
                 invested = investorProject.InvestedInProject();
                 myProjectExplorerLink = _NetworkConfiguration.GetExplorerUrl().Url + $"/transaction/{investorProject.TransactionId}";
                 projectStats.Loading = false;
+                SetProjectLinksAndRefreshBalance();
                 return;
             }
 
             project = SessionStorage.GetProjectById(ProjectId);
             if (project != null)
             {
-                await SetProjectLinksAndRefreshBalance();
                 projectStats.Loading = false;
+                SetProjectLinksAndRefreshBalance();
                 StateHasChanged();
                 return;
             }
diff --git a/src/Angor/Client/Pages/Wallet.razor b/src/Angor/Client/Pages/Wallet.razor
index b4cc3fd9..abf719ea 100644
--- a/src/Angor/Client/Pages/Wallet.razor
+++ b/src/Angor/Client/Pages/Wallet.razor
@@ -237,7 +237,7 @@ else
                         </div>
 
                     </div>
-                    @if (network.NetworkType != NetworkType.Mainnet && (accountBalanceInfo.TotalUnconfirmedBalance <= 0) & (accountBalanceInfo.TotalBalance <= 0))
+                    @if (CanGetTestCoins())
                     {
                         <div class="d-flex flex-wrap align-items-center">
                             <button class="btn btn-border ms-2" data-cy="get-test-coins" @onclick="GetTestCoins" disabled="@testCoinsSpinner">
@@ -1201,9 +1201,8 @@ else
 
     private async Task GetTestCoins()
     {
-        if (Money.Satoshis(accountBalanceInfo.TotalBalance + accountBalanceInfo.TotalUnconfirmedBalance).ToUnit(MoneyUnit.BTC) > 10)
+        if (!CanGetTestCoins())
         {
-            notificationComponent.ShowNotificationMessage("you already have coins!");
             return;
         }
 
@@ -1231,6 +1230,22 @@ else
         }
     }
 
+    private bool CanGetTestCoins()
+    {
+        if (network.NetworkType == NetworkType.Mainnet)
+        {
+            return false;
+        }
+
+        if (Money.Satoshis(accountBalanceInfo.TotalBalance + accountBalanceInfo.TotalUnconfirmedBalance).ToUnit(MoneyUnit.BTC) > 100)
+        {
+            notificationComponent.ShowNotificationMessage("you already have too much test coins!");
+            return false;
+        }
+
+        return true;
+    }
+
     void SetActiveTab(int tab)
     {
         activeTab = tab;