diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 8fccef72f..c46881344 100644
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -817,7 +817,7 @@ void MainWindow::on_actionSetGlobalUploadLimit_triggered()
 {
     qDebug() << Q_FUNC_INFO;
     BitTorrent::Session *const session = BitTorrent::Session::instance();
-    bool ok;
+    bool ok = false;
     const long newLimit = SpeedLimitDialog::askSpeedLimit(
                 &ok, tr("Global Upload Speed Limit"), session->uploadSpeedLimit());
     if (ok) {
@@ -830,7 +830,7 @@ void MainWindow::on_actionSetGlobalDownloadLimit_triggered()
 {
     qDebug() << Q_FUNC_INFO;
     BitTorrent::Session *const session = BitTorrent::Session::instance();
-    bool ok;
+    bool ok = false;
     const long newLimit = SpeedLimitDialog::askSpeedLimit(
                 &ok, tr("Global Download Speed Limit"), session->downloadSpeedLimit());
     if (ok) {
diff --git a/src/gui/optionsdlg.cpp b/src/gui/optionsdlg.cpp
index acc325142..b9654c581 100644
--- a/src/gui/optionsdlg.cpp
+++ b/src/gui/optionsdlg.cpp
@@ -1056,7 +1056,7 @@ bool OptionsDialog::isUPnPEnabled() const
 // [download,upload]
 QPair<int, int> OptionsDialog::getGlobalBandwidthLimits() const
 {
-    int DL = -1, UP = -1;
+    int DL = 0, UP = 0;
     if (m_ui->checkDownloadLimit->isChecked())
         DL = m_ui->spinDownloadLimit->value();
     if (m_ui->checkUploadLimit->isChecked())
@@ -1068,7 +1068,7 @@ QPair<int, int> OptionsDialog::getGlobalBandwidthLimits() const
 // [download,upload]
 QPair<int, int> OptionsDialog::getAltGlobalBandwidthLimits() const
 {
-    int DL = -1, UP = -1;
+    int DL = 0, UP = 0;
     if (m_ui->checkDownloadLimitAlt->isChecked())
         DL = m_ui->spinDownloadLimitAlt->value();
     if (m_ui->checkUploadLimitAlt->isChecked())
diff --git a/src/gui/speedlimitdlg.cpp b/src/gui/speedlimitdlg.cpp
index c9ba9cb1b..58e792dfc 100644
--- a/src/gui/speedlimitdlg.cpp
+++ b/src/gui/speedlimitdlg.cpp
@@ -56,7 +56,7 @@ long SpeedLimitDialog::askSpeedLimit(bool *ok, QString title, long default_value
         *ok = true;
         int val = dlg.getSpeedLimit();
         if (val <= 0)
-            return -1;
+            return 0;
         return val * 1024;
     }
     else {
@@ -112,4 +112,4 @@ void SpeedLimitDialog::setupDialog(long max_slider, long val) const
     bandwidthSlider->setMaximum(max_slider);
     bandwidthSlider->setValue(val);
     updateSpinValue(val);
-}
\ No newline at end of file
+}
diff --git a/src/gui/statusbar.cpp b/src/gui/statusbar.cpp
index 02c65bbf7..082f8906d 100644
--- a/src/gui/statusbar.cpp
+++ b/src/gui/statusbar.cpp
@@ -205,13 +205,13 @@ void StatusBar::updateSpeedLabels(const BitTorrent::SessionStatus &sessionStatus
 {
     QString speedLbl = Utils::Misc::friendlyUnit(sessionStatus.payloadDownloadRate(), true);
     int speedLimit = BitTorrent::Session::instance()->downloadSpeedLimit();
-    if (speedLimit >= 0)
+    if (speedLimit)
         speedLbl += " [" + Utils::Misc::friendlyUnit(speedLimit, true) + "]";
     speedLbl += " (" + Utils::Misc::friendlyUnit(sessionStatus.totalPayloadDownload()) + ")";
     m_dlSpeedLbl->setText(speedLbl);
     speedLimit = BitTorrent::Session::instance()->uploadSpeedLimit();
     speedLbl = Utils::Misc::friendlyUnit(sessionStatus.payloadUploadRate(), true);
-    if (speedLimit >= 0)
+    if (speedLimit)
         speedLbl += " [" + Utils::Misc::friendlyUnit(speedLimit, true) + "]";
     speedLbl += " (" + Utils::Misc::friendlyUnit(sessionStatus.totalPayloadUpload()) + ")";
     m_upSpeedLbl->setText(speedLbl);
@@ -252,17 +252,11 @@ void StatusBar::capDownloadSpeed()
 {
     BitTorrent::Session *const session = BitTorrent::Session::instance();
     bool ok = false;
-    long newLimit = SpeedLimitDialog::askSpeedLimit(
+    const long newLimit = SpeedLimitDialog::askSpeedLimit(
                 &ok, tr("Global Download Speed Limit"), session->downloadSpeedLimit());
     if (ok) {
-        if (newLimit <= 0) {
-            qDebug("Setting global download rate limit to Unlimited");
-            session->setDownloadSpeedLimit(-1);
-        }
-        else {
-            qDebug("Setting global download rate limit to %.1fKb/s", newLimit / 1024.);
-            session->setDownloadSpeedLimit(newLimit);
-        }
+        qDebug("Setting global download rate limit to %.1fKb/s", newLimit / 1024.);
+        session->setDownloadSpeedLimit(newLimit);
         refreshStatusBar();
     }
 }
@@ -271,17 +265,11 @@ void StatusBar::capUploadSpeed()
 {
     BitTorrent::Session *const session = BitTorrent::Session::instance();
     bool ok = false;
-    long newLimit = SpeedLimitDialog::askSpeedLimit(
+    const long newLimit = SpeedLimitDialog::askSpeedLimit(
                 &ok, tr("Global Upload Speed Limit"), session->uploadSpeedLimit());
     if (ok) {
-        if (newLimit <= 0) {
-            qDebug("Setting global upload rate limit to Unlimited");
-            session->setUploadSpeedLimit(-1);
-        }
-        else {
-            qDebug("Setting global upload rate limit to %.1fKb/s", newLimit / 1024.);
-            session->setUploadSpeedLimit(newLimit);
-        }
+        qDebug("Setting global upload rate limit to %.1fKb/s", newLimit / 1024.);
+        session->setUploadSpeedLimit(newLimit);
         refreshStatusBar();
     }
 }