diff --git a/src/proxycontroller.cpp b/src/proxycontroller.cpp
index d9485b08f..daad86e65 100644
--- a/src/proxycontroller.cpp
+++ b/src/proxycontroller.cpp
@@ -4,6 +4,7 @@
 #include "proxycontroller.h"
 
 #include <QNetworkProxy>
+#include <QNetworkProxyFactory>
 
 #include "neochatconfig.h"
 
@@ -15,18 +16,24 @@ void ProxyController::setApplicationProxy()
     switch (cfg->proxyType()) {
     case 1:
         proxy.setType(QNetworkProxy::HttpProxy);
+        proxy.setHostName(cfg->proxyHost());
+        proxy.setPort(cfg->proxyPort());
+        proxy.setUser(cfg->proxyUser());
+        proxy.setPassword(cfg->proxyPassword());
+        QNetworkProxy::setApplicationProxy(proxy);
         break;
     case 2:
         proxy.setType(QNetworkProxy::Socks5Proxy);
+        proxy.setHostName(cfg->proxyHost());
+        proxy.setPort(cfg->proxyPort());
+        proxy.setUser(cfg->proxyUser());
+        proxy.setPassword(cfg->proxyPassword());
+        QNetworkProxy::setApplicationProxy(proxy);
         break;
     default:
+        QNetworkProxyFactory::setUseSystemConfiguration(true);
         break;
     }
-    proxy.setHostName(cfg->proxyHost());
-    proxy.setPort(cfg->proxyPort());
-    proxy.setUser(cfg->proxyUser());
-    proxy.setPassword(cfg->proxyPassword());
-    QNetworkProxy::setApplicationProxy(proxy);
 }
 
 ProxyController::ProxyController(QObject *parent)
diff --git a/src/settings/NetworkProxyPage.qml b/src/settings/NetworkProxyPage.qml
index 926c6d45d..0df9d7c69 100644
--- a/src/settings/NetworkProxyPage.qml
+++ b/src/settings/NetworkProxyPage.qml
@@ -7,6 +7,8 @@ import QtQuick.Layouts
 
 import org.kde.kirigamiaddons.formcard as FormCard
 
+import org.kde.neochat
+
 FormCard.FormCardPage {
     id: root