diff --git a/src/sendtab.cpp b/src/sendtab.cpp
index e33a833..efd196a 100644
--- a/src/sendtab.cpp
+++ b/src/sendtab.cpp
@@ -371,7 +371,15 @@ void MainWindow::maxAmountChecked(int checked) {
             auto amt  = ui->sendToWidgets->findChild<QLineEdit*>(QString("Amount")  % QString::number(i+1));
             sumAllAmounts += amt->text().toDouble();
         }
-        sumAllAmounts += Settings::getTotalFee();
+
+        if (Settings::getInstance()->getAllowCustomFees()) {
+            sumAllAmounts = ui->minerFeeAmt->text().toDouble();
+        }
+        else {
+            sumAllAmounts += Settings::getMinerFee();
+        }
+
+        
 
         auto addr = ui->inputsCombo->currentText();
 
diff --git a/src/settings.cpp b/src/settings.cpp
index 5d2e431..a4f416f 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -219,8 +219,6 @@ QString Settings::getZboardAddr() {
     }
 }
 
-double Settings::getTotalFee() { return getMinerFee(); }
-
 bool Settings::isValidAddress(QString addr) {
     QRegExp zcexp("^z[a-z0-9]{94}$",  Qt::CaseInsensitive);
     QRegExp zsexp("^z[a-z0-9]{77}$",  Qt::CaseInsensitive);
diff --git a/src/settings.h b/src/settings.h
index 7261b73..5d9de63 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -73,8 +73,6 @@ public:
     static double  getMinerFee();
     static double  getZboardAmount();
     static QString getZboardAddr();
-
-    static double  getTotalFee();
     
     static bool    isValidAddress(QString addr);