diff --git a/code/MessengerApi.Configuration/Sources/Environment/EnvironmentConfigurationSource.cs b/code/MessengerApi.Configuration/Sources/Environment/EnvironmentConfigurationSource.cs
index ca63b81..264c6ff 100644
--- a/code/MessengerApi.Configuration/Sources/Environment/EnvironmentConfigurationSource.cs
+++ b/code/MessengerApi.Configuration/Sources/Environment/EnvironmentConfigurationSource.cs
@@ -9,6 +9,12 @@
 
         public T GetValue<T>(string key)
         {
+            if (typeof(T).Equals(typeof(Guid)))
+            {
+                var guid = Guid.Parse(System.Environment.GetEnvironmentVariable(key));
+                return (T)Convert.ChangeType(guid, typeof(T));
+            }
+
             return (T)Convert.ChangeType(System.Environment.GetEnvironmentVariable(key), typeof(T));
         }
     }