diff --git a/Granicus.MediaManager.UserSDK/MediaManager.cs b/Granicus.MediaManager.UserSDK/MediaManager.cs
index 8411a87..d95046b 100644
--- a/Granicus.MediaManager.UserSDK/MediaManager.cs
+++ b/Granicus.MediaManager.UserSDK/MediaManager.cs
@@ -124,9 +124,17 @@ private string m_SafeServerURL(string Server)
         {
             if (!Server.StartsWith("https://") && !Server.StartsWith("http://"))
             {
-                Server = "https://" + Server;
-            } else if(Server.StartsWith("http://") && !Server.Contains("mm.lvh.me")) {
-              Server = Server.Replace("http://","https://");
+                string serverHost = Server.Split(':')[0]; // Remove port if present
+                System.Net.IPAddress ipAddress;
+                bool isIp = System.Net.IPAddress.TryParse(serverHost, out ipAddress);
+                if (isIp)
+                {
+                    Server = "http://" + Server;
+                }
+                else
+                {
+                    Server = "https://" + Server;
+                }
             }
             if (!Server.EndsWith("/"))
             {
diff --git a/Granicus.MediaManager.UserSDK/MediaVault.cs b/Granicus.MediaManager.UserSDK/MediaVault.cs
index 362b3ed..574461e 100644
--- a/Granicus.MediaManager.UserSDK/MediaVault.cs
+++ b/Granicus.MediaManager.UserSDK/MediaVault.cs
@@ -201,9 +201,18 @@ protected override WebRequest GetWebRequest(Uri uri)
         /// <returns></returns>
         private string m_SafeServerURL(ServerInterfaceData Server)
         {
-            if (!Server.Host.StartsWith("http://"))
+            if (!Server.Host.StartsWith("http://") && !Server.Host.StartsWith("https://"))
             {
-                Server.Host = "http://" + Server.Host;
+                System.Net.IPAddress ipAddress;
+                bool isIp = System.Net.IPAddress.TryParse(Server.Host, out ipAddress);
+                if (isIp)
+                {
+                    Server.Host = "http://" + Server.Host;
+                }
+                else
+                {
+                    Server.Host = "https://" + Server.Host;
+                }
             }
             if (Server.Host.EndsWith("/"))
             {