diff --git a/reactos/dll/win32/netshell/lang/bg-BG.rc b/reactos/dll/win32/netshell/lang/bg-BG.rc
index 5df597d7064..b63d03fcf35 100644
--- a/reactos/dll/win32/netshell/lang/bg-BG.rc
+++ b/reactos/dll/win32/netshell/lang/bg-BG.rc
@@ -63,7 +63,7 @@ BEGIN
  RTEXT "Íåíàëè÷íî", IDC_DETAILSTYPE, 122, 20, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
- RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
 
  PUSHBUTTON "&Ïîäðîáíîñòè...", IDC_DETAILS, 22, 76, 62, 14
 END
diff --git a/reactos/dll/win32/netshell/lang/cs-CZ.rc b/reactos/dll/win32/netshell/lang/cs-CZ.rc
index 01a1e64700d..896d9975bdb 100644
--- a/reactos/dll/win32/netshell/lang/cs-CZ.rc
+++ b/reactos/dll/win32/netshell/lang/cs-CZ.rc
@@ -62,7 +62,7 @@ BEGIN
  RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
- RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
 
  PUSHBUTTON "&Detaily...", IDC_DETAILS, 22, 76, 62, 14
 END
diff --git a/reactos/dll/win32/netshell/lang/da-DK.rc b/reactos/dll/win32/netshell/lang/da-DK.rc
index d28274a9b7b..682914a6d5a 100644
--- a/reactos/dll/win32/netshell/lang/da-DK.rc
+++ b/reactos/dll/win32/netshell/lang/da-DK.rc
@@ -62,7 +62,7 @@ BEGIN
  RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
- RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
 
  PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
 END
diff --git a/reactos/dll/win32/netshell/lang/de-DE.rc b/reactos/dll/win32/netshell/lang/de-DE.rc
index 7b86e1bee03..5026f25ae39 100644
--- a/reactos/dll/win32/netshell/lang/de-DE.rc
+++ b/reactos/dll/win32/netshell/lang/de-DE.rc
@@ -63,7 +63,7 @@ BEGIN
 	RTEXT "Nicht verfügbar", IDC_DETAILSTYPE, 122, 20, 80, 8
 	RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
 	RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
-	RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+	RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
 
 	PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
 END
diff --git a/reactos/dll/win32/netshell/lang/el-GR.rc b/reactos/dll/win32/netshell/lang/el-GR.rc
index 7eb9f0baa4a..9df47c3fc46 100644
--- a/reactos/dll/win32/netshell/lang/el-GR.rc
+++ b/reactos/dll/win32/netshell/lang/el-GR.rc
@@ -62,7 +62,7 @@ BEGIN
  RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
- RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
 
  PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
 END
diff --git a/reactos/dll/win32/netshell/lang/en-US.rc b/reactos/dll/win32/netshell/lang/en-US.rc
index d46f007ec6e..525b5c07b56 100644
--- a/reactos/dll/win32/netshell/lang/en-US.rc
+++ b/reactos/dll/win32/netshell/lang/en-US.rc
@@ -63,7 +63,7 @@ BEGIN
  RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
- RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
 
  PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
 END
diff --git a/reactos/dll/win32/netshell/lang/es-ES.rc b/reactos/dll/win32/netshell/lang/es-ES.rc
index 2cf82a57560..64000115d4a 100644
--- a/reactos/dll/win32/netshell/lang/es-ES.rc
+++ b/reactos/dll/win32/netshell/lang/es-ES.rc
@@ -57,7 +57,7 @@ BEGIN
  RTEXT "N/A", IDC_DETAILSTYPE, 110, 20, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSIP, 110, 34, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 110, 48, 80, 8
- RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 110, 62, 80, 8
+ RTEXT "", IDC_DETAILSGATEWAY, 110, 62, 80, 8
 
  PUSHBUTTON "&Detalles...", IDC_DETAILS, 22, 76, 62, 14
 END
diff --git a/reactos/dll/win32/netshell/lang/fr-FR.rc b/reactos/dll/win32/netshell/lang/fr-FR.rc
index 13188f3fc89..23dfe47b6bf 100644
--- a/reactos/dll/win32/netshell/lang/fr-FR.rc
+++ b/reactos/dll/win32/netshell/lang/fr-FR.rc
@@ -62,7 +62,7 @@ BEGIN
  RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
- RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
 
  PUSHBUTTON "&Détails...", IDC_DETAILS, 22, 76, 62, 14
 END
diff --git a/reactos/dll/win32/netshell/lang/hu-HU.rc b/reactos/dll/win32/netshell/lang/hu-HU.rc
index c3153aea0e4..dc6b75047a4 100644
--- a/reactos/dll/win32/netshell/lang/hu-HU.rc
+++ b/reactos/dll/win32/netshell/lang/hu-HU.rc
@@ -63,7 +63,7 @@ BEGIN
  RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
- RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
 
  PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
 END
diff --git a/reactos/dll/win32/netshell/lang/id-ID.rc b/reactos/dll/win32/netshell/lang/id-ID.rc
index 488b9886139..b6936192f0c 100644
--- a/reactos/dll/win32/netshell/lang/id-ID.rc
+++ b/reactos/dll/win32/netshell/lang/id-ID.rc
@@ -62,7 +62,7 @@ BEGIN
  RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
- RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
 
  PUSHBUTTON "&Detil...", IDC_DETAILS, 22, 76, 62, 14
 END
diff --git a/reactos/dll/win32/netshell/lang/it-IT.rc b/reactos/dll/win32/netshell/lang/it-IT.rc
index 481cbc3ecc8..b4c895c0502 100644
--- a/reactos/dll/win32/netshell/lang/it-IT.rc
+++ b/reactos/dll/win32/netshell/lang/it-IT.rc
@@ -67,7 +67,7 @@ BEGIN
  RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
- RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
 
  PUSHBUTTON "&Dettagli...", IDC_DETAILS, 22, 76, 62, 14
 END
diff --git a/reactos/dll/win32/netshell/lang/ja-JP.rc b/reactos/dll/win32/netshell/lang/ja-JP.rc
index d42efdc6a78..12c4544be5e 100644
--- a/reactos/dll/win32/netshell/lang/ja-JP.rc
+++ b/reactos/dll/win32/netshell/lang/ja-JP.rc
@@ -62,7 +62,7 @@ BEGIN
  RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
- RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
 
  PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
 END
diff --git a/reactos/dll/win32/netshell/lang/nl-NL.rc b/reactos/dll/win32/netshell/lang/nl-NL.rc
index c37465fe8b6..70d8e064299 100644
--- a/reactos/dll/win32/netshell/lang/nl-NL.rc
+++ b/reactos/dll/win32/netshell/lang/nl-NL.rc
@@ -62,7 +62,7 @@ BEGIN
  RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
- RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
 
  PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
 END
diff --git a/reactos/dll/win32/netshell/lang/no-NO.rc b/reactos/dll/win32/netshell/lang/no-NO.rc
index 5409581b9e2..6577ebd956e 100644
--- a/reactos/dll/win32/netshell/lang/no-NO.rc
+++ b/reactos/dll/win32/netshell/lang/no-NO.rc
@@ -66,7 +66,7 @@ BEGIN
  RTEXT "Ikke tilgjengelig", IDC_DETAILSTYPE, 122, 20, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
- RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
  
  PUSHBUTTON "&Detaljer...", IDC_DETAILS, 22, 76, 62, 14
 END
diff --git a/reactos/dll/win32/netshell/lang/pl-PL.rc b/reactos/dll/win32/netshell/lang/pl-PL.rc
index 74ab1bdae83..a389342b0c4 100644
--- a/reactos/dll/win32/netshell/lang/pl-PL.rc
+++ b/reactos/dll/win32/netshell/lang/pl-PL.rc
@@ -63,7 +63,7 @@ BEGIN
  RTEXT "n/d", IDC_DETAILSTYPE, 122, 20, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
- RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
 
  PUSHBUTTON "&Szczegó³y...", IDC_DETAILS, 22, 76, 62, 14
 END
diff --git a/reactos/dll/win32/netshell/lang/ru-RU.rc b/reactos/dll/win32/netshell/lang/ru-RU.rc
index 4f4f7fdb051..1356c31f9a0 100644
--- a/reactos/dll/win32/netshell/lang/ru-RU.rc
+++ b/reactos/dll/win32/netshell/lang/ru-RU.rc
@@ -63,7 +63,7 @@ BEGIN
  RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
- RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
 
  PUSHBUTTON "&Äîïîëíèòåëüíî...", IDC_DETAILS, 22, 76, 62, 14
 END
diff --git a/reactos/dll/win32/netshell/lang/sk-SK.rc b/reactos/dll/win32/netshell/lang/sk-SK.rc
index e205371028c..3555bac4795 100644
--- a/reactos/dll/win32/netshell/lang/sk-SK.rc
+++ b/reactos/dll/win32/netshell/lang/sk-SK.rc
@@ -68,7 +68,7 @@ BEGIN
  RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
- RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
 
  PUSHBUTTON "Po&drobnosti...", IDC_DETAILS, 22, 76, 62, 14
 END
diff --git a/reactos/dll/win32/netshell/lang/sv-SE.rc b/reactos/dll/win32/netshell/lang/sv-SE.rc
index c6afd14a302..d7243c4e8be 100644
--- a/reactos/dll/win32/netshell/lang/sv-SE.rc
+++ b/reactos/dll/win32/netshell/lang/sv-SE.rc
@@ -63,7 +63,7 @@ BEGIN
  RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
- RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
 
  PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
 END
diff --git a/reactos/dll/win32/netshell/lang/uk-UA.rc b/reactos/dll/win32/netshell/lang/uk-UA.rc
index 0b9b84dc99f..8c83b7e4956 100644
--- a/reactos/dll/win32/netshell/lang/uk-UA.rc
+++ b/reactos/dll/win32/netshell/lang/uk-UA.rc
@@ -65,7 +65,7 @@ BEGIN
  RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
- RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
 
  PUSHBUTTON "&Ñêëàä...", IDC_DETAILS, 22, 76, 62, 14
 END
diff --git a/reactos/dll/win32/netshell/lang/zh-CN.rc b/reactos/dll/win32/netshell/lang/zh-CN.rc
index b0de6087275..184a73c0f7a 100644
--- a/reactos/dll/win32/netshell/lang/zh-CN.rc
+++ b/reactos/dll/win32/netshell/lang/zh-CN.rc
@@ -62,7 +62,7 @@ BEGIN
  RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8
  RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8
- RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8
+ RTEXT "", IDC_DETAILSGATEWAY, 122, 62, 80, 8
 
  PUSHBUTTON "&Details...", IDC_DETAILS, 22, 76, 62, 14
 END
diff --git a/reactos/dll/win32/netshell/lanstatusui.c b/reactos/dll/win32/netshell/lanstatusui.c
index e3e6aaca0ee..185fec8bda7 100644
--- a/reactos/dll/win32/netshell/lanstatusui.c
+++ b/reactos/dll/win32/netshell/lanstatusui.c
@@ -443,10 +443,11 @@ LANStatusUiDetailsDlg(
                         SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li);
 
                 li.iItem = InsertItemToListView(hDlgCtrl, IDS_DEF_GATEWAY);
-                if (li.iItem >= 0)
+                if (li.iItem >= 0 && pCurAdapter->GatewayList.IpAddress.String[0] != '0')
+                {
                     if (MultiByteToWideChar(CP_ACP, 0, pCurAdapter->GatewayList.IpAddress.String, -1, szBuffer, sizeof(szBuffer)/sizeof(WCHAR)))
                         SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li);
-
+                }
 #if 0
                 li.iItem = InsertItemToListView(hDlgCtrl, IDS_LEASE_OBTAINED);
                 li.iItem = InsertItemToListView(hDlgCtrl, IDS_LEASE_EXPIRES);
@@ -529,10 +530,12 @@ LANStatusUiAdvancedDlg(
             SendDlgItemMessageW(hwndDlg, IDC_DETAILSSUBNET, WM_SETTEXT, 0, (LPARAM)szBuffer);
 
             dwIpAddr = ntohl(pContext->Gateway);
-            swprintf(szBuffer, L"%u.%u.%u.%u", FIRST_IPADDRESS(dwIpAddr), SECOND_IPADDRESS(dwIpAddr),
-                     THIRD_IPADDRESS(dwIpAddr), FOURTH_IPADDRESS(dwIpAddr));
-            SendDlgItemMessageW(hwndDlg, IDC_DETAILSGATEWAY, WM_SETTEXT, 0, (LPARAM)szBuffer);
-
+            if (dwIpAddr)
+            {
+                swprintf(szBuffer, L"%u.%u.%u.%u", FIRST_IPADDRESS(dwIpAddr), SECOND_IPADDRESS(dwIpAddr),
+                         THIRD_IPADDRESS(dwIpAddr), FOURTH_IPADDRESS(dwIpAddr));
+                SendDlgItemMessageW(hwndDlg, IDC_DETAILSGATEWAY, WM_SETTEXT, 0, (LPARAM)szBuffer);
+            }
             return TRUE;
         case WM_COMMAND:
             if (LOWORD(wParam) == IDC_DETAILS)