diff --git a/Vostok.Commons.Environment.Tests/EnvironmentInfo_Tests.cs b/Vostok.Commons.Environment.Tests/EnvironmentInfo_Tests.cs
index 2963264..4375e2e 100644
--- a/Vostok.Commons.Environment.Tests/EnvironmentInfo_Tests.cs
+++ b/Vostok.Commons.Environment.Tests/EnvironmentInfo_Tests.cs
@@ -26,9 +26,9 @@ public void FQDN_should_not_be_null_or_empty()
         }
 
         [Test]
-        public void ServiceDiscoveryIPv4_should_be_null_or_empty_if_environment_variable_is_not_set()
+        public void ServiceDiscoveryIPv4_should_be_null_if_environment_variable_is_not_set()
         {
-            EnvironmentInfo.ServiceDiscoveryIPv4.Should().BeNullOrEmpty();
+            EnvironmentInfo.ServiceDiscoveryIPv4.Should().BeNull();
 
             Console.Out.WriteLine(EnvironmentInfo.ServiceDiscoveryIPv4);
         }
diff --git a/Vostok.Commons.Environment/EnvironmentInfo.cs b/Vostok.Commons.Environment/EnvironmentInfo.cs
index 928696a..4a53b4a 100644
--- a/Vostok.Commons.Environment/EnvironmentInfo.cs
+++ b/Vostok.Commons.Environment/EnvironmentInfo.cs
@@ -206,7 +206,11 @@ private static string ObtainServiceDiscoveryIPv4()
         {
             try
             {
-                return System.Environment.GetEnvironmentVariable(LocalServiceDiscoveryIPv4Variable);
+                var localIPv4 = System.Environment.GetEnvironmentVariable(LocalServiceDiscoveryIPv4Variable);
+                if (!string.IsNullOrEmpty(localIPv4))
+                    return localIPv4;
+
+                return null;
             }
             catch
             {