diff --git a/src/device/networkmanager.cpp b/src/device/networkmanager.cpp
index d2be260..44fc2ba 100644
--- a/src/device/networkmanager.cpp
+++ b/src/device/networkmanager.cpp
@@ -63,6 +63,7 @@ void NetworkManager::initNetworkInfo()
                     mIsDHCP = !entry.isPermanent();
                     mIpAddress = entry.ip().toString();
                     mSubNetMask = entry.netmask().toString();
+                    mGateway = JsonObject::Instance()->getDefaultIpAddr().gateway;
                     return;
                 }
             }
diff --git a/src/dialogs/IpSettingsDialog.cpp b/src/dialogs/IpSettingsDialog.cpp
index e37a38a..712246e 100644
--- a/src/dialogs/IpSettingsDialog.cpp
+++ b/src/dialogs/IpSettingsDialog.cpp
@@ -20,7 +20,7 @@ IpSettingsDialog::IpSettingsDialog(QWidget* aParent, Qt::WindowFlags aFlag)
     , mGateway(new ULineEdit(this))
     , mThread(nullptr)
 {
-    IpAddr addr = JsonObject::Instance()->getDefaultIpAddr();
+    IpAddr addr = NetworkManager::getInstance()->getDefaultIpAddr();
     mDhcpButton->setChecked(addr.dhcp);
     mIpAddress->setText(addr.ip);
     mSubnetMask->setText(addr.mask);
diff --git a/src/json/jsonobject.cpp b/src/json/jsonobject.cpp
index 1572b65..027f361 100644
--- a/src/json/jsonobject.cpp
+++ b/src/json/jsonobject.cpp
@@ -507,7 +507,7 @@ void JsonObject::setDefaultIpAddr(const IpAddr& addr)
 {
 	setJsonString("address", "ip", addr.ip.toStdString().c_str());
 	setJsonString("address", "mask", addr.mask.toStdString().c_str());
-    setJsonString("address", "gateway", addr.ip.toStdString().c_str());
+    setJsonString("address", "gateway", addr.gateway.toStdString().c_str());
     setBool("address","dhcp", addr.dhcp, true);
     mDefaultIpAddress = addr;
 }