diff --git a/P3D/Network/Servers/ServerConnection.vb b/P3D/Network/Servers/ServerConnection.vb
index fc12fab08..1f145ba9a 100644
--- a/P3D/Network/Servers/ServerConnection.vb
+++ b/P3D/Network/Servers/ServerConnection.vb
@@ -53,12 +53,15 @@ Namespace Servers
             Try
                 Dim connectIP As IPAddress = Nothing
 
-                For Each IPAddress In System.Net.Dns.GetHostEntry(Server.IP).AddressList
-                    If IPAddress.AddressFamily = AddressFamily.InterNetwork Then
-                        connectIP = IPAddress
-                        Exit For
-                    End If
-                Next
+                If Not IPAddress.TryParse(Server.IP, connectIP) Then
+                    For Each IPAddress In Dns.GetHostEntry(Server.IP).AddressList
+                        If IPAddress.AddressFamily = AddressFamily.InterNetwork Then
+                            connectIP = IPAddress
+                            Exit For
+                        End If
+                    Next
+                End If
+
 
                 Me._client.Connect(connectIP.ToString, CInt(Server.Port))
 
diff --git a/P3D/Screens/MainMenu/JoinServerScreen.vb b/P3D/Screens/MainMenu/JoinServerScreen.vb
index 981f754b6..78a76ad5f 100644
--- a/P3D/Screens/MainMenu/JoinServerScreen.vb
+++ b/P3D/Screens/MainMenu/JoinServerScreen.vb
@@ -466,12 +466,14 @@ Public Class JoinServerScreen
 
                 Dim connectIP As IPAddress = Nothing
 
-                For Each ipaddress In System.Net.Dns.GetHostEntry(Me.IP).AddressList
-                    If ipaddress.AddressFamily = AddressFamily.InterNetwork Then
-                        connectIP = ipaddress
-                        Exit For
-                    End If
-                Next
+                If Not IPAddress.TryParse(IP, connectIP) Then
+                    For Each ipaddress In Dns.GetHostEntry(IP).AddressList
+                        If ipaddress.AddressFamily = AddressFamily.InterNetwork Then
+                            connectIP = ipaddress
+                            Exit For
+                        End If
+                    Next
+                End If
 
                 sw.Start()
                 client.Connect(connectIP, CInt(Me.Port))