diff --git a/src/Splat.DependencyInjection.SourceGenerator.Tests/RegisterLazySingletonTests.LazyParameterRegisteredLazy_contract=.00.verified.cs b/src/Splat.DependencyInjection.SourceGenerator.Tests/RegisterLazySingletonTests.LazyParameterRegisteredLazy_contract=.00.verified.cs
new file mode 100644
index 0000000..c0f90b4
--- /dev/null
+++ b/src/Splat.DependencyInjection.SourceGenerator.Tests/RegisterLazySingletonTests.LazyParameterRegisteredLazy_contract=.00.verified.cs
@@ -0,0 +1,149 @@
+//HintName: Splat.DI.Extensions.SourceGenerated.cs
+
+// <auto-generated />
+namespace Splat
+{
+    /// <summary>
+    /// Extension methods for the Splat DI source generator.
+    /// </summary>
+    internal static partial class SplatRegistrations
+    {
+        /// <summary>
+        /// Registers a class with its concrete class.
+        /// </summary>
+        public static void Register<TInterface, TConcrete>()
+        {
+        }
+
+        /// <summary>
+        /// Registers a class with its concrete class.
+        /// </summary>
+        /// <param name="contract">Optional contract.</param>
+        public static void Register<TInterface, TConcrete>(string contract)
+        {
+        }
+
+        /// <summary>
+        /// Registers a class with its concrete class.
+        /// </summary>
+        public static void RegisterLazySingleton<TInterface, TConcrete>()
+        {
+        }
+
+        /// <summary>
+        /// Registers a class with its concrete class.
+        /// </summary>
+        /// <param name="mode">The threading mode.</param>
+        public static void RegisterLazySingleton<TInterface, TConcrete>(System.Threading.LazyThreadSafetyMode mode)
+        {
+        }
+
+        /// <summary>
+        /// Registers a class with its concrete class.
+        /// </summary>
+        /// <param name="contract">Optional contract.</param>
+        public static void RegisterLazySingleton<TInterface, TConcrete>(string contract)
+        {
+        }
+
+        /// <summary>
+        /// Registers a class with its concrete class.
+        /// </summary>
+        /// <param name="contract">Optional contract.</param>
+        /// <param name="mode">The threading mode.</param>
+        public static void RegisterLazySingleton<TInterface, TConcrete>(string contract, System.Threading.LazyThreadSafetyMode mode)
+        {
+        }
+
+        /// <summary>
+        /// Registers a class with its concrete class.
+        /// </summary>
+        public static void Register<T>()
+        {
+        }
+
+
+        /// <summary>
+        /// Registers a class with its concrete class.
+        /// </summary>
+        /// <param name="contract">Optional contract.</param>
+        public static void Register<T>(string contract)
+        {
+        }
+
+        /// <summary>
+        /// Registers a lazy class with its concrete class.
+        /// </summary>
+        public static void RegisterLazySingleton<T>()
+        {
+        }
+
+
+        /// <summary>
+        /// Registers a lazy class with its concrete class.
+        /// </summary>
+        /// <param name="contract">Optional contract.</param>
+        public static void RegisterLazySingleton<T>(string contract)
+        {
+        }
+
+        /// <summary>
+        /// Proxy for the Splat SetService.
+        /// </summary>
+        public static void RegisterConstant<T>(T instance) => Splat.Locator.CurrentMutable.RegisterConstant<T>(instance);
+
+        /// <summary>
+        /// Proxy for the Splat SetService.
+        /// </summary>
+        /// <param name="contract">Optional contract.</param>
+        public static void RegisterConstant<T>(T instance, string contract) => Splat.Locator.CurrentMutable.RegisterConstant<T>(instance, contract);
+
+        /// <summary>
+        /// Registers the registrations.
+        /// </summary>
+        public static void SetupIOC()
+        {
+            SetupIOCInternal(Splat.Locator.GetLocator());
+        }
+
+        /// <summary>
+        /// Registers the registrations.
+        /// </summary>
+        /// <param name="resolver">The resolver to register with.</param>
+        public static void SetupIOC(Splat.IDependencyResolver resolver)
+        {
+            SetupIOCInternal(resolver);
+        }
+
+
+        static partial void SetupIOCInternal(Splat.IDependencyResolver resolver);
+    }
+
+    /// <summary>
+    /// Makes the property get added by the DI engine.
+    /// </summary>
+    [System.AttributeUsage(System.AttributeTargets.Property)]
+    internal class DependencyInjectionPropertyAttribute : System.Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DependencyInjectionPropertyAttribute"/> class.
+        /// </summary>
+        public DependencyInjectionPropertyAttribute()
+        {
+        }
+    }
+
+    /// <summary>
+    /// Makes this the constructor used by the DI engine.
+    /// </summary>
+    [System.AttributeUsage(System.AttributeTargets.Constructor)]
+    internal class DependencyInjectionConstructorAttribute : System.Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DependencyInjectionConstructorAttribute"/> class.
+        /// </summary>
+        public DependencyInjectionConstructorAttribute()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Splat.DependencyInjection.SourceGenerator.Tests/RegisterLazySingletonTests.LazyParameterRegisteredLazy_contract=.01.verified.cs b/src/Splat.DependencyInjection.SourceGenerator.Tests/RegisterLazySingletonTests.LazyParameterRegisteredLazy_contract=.01.verified.cs
new file mode 100644
index 0000000..2abea93
--- /dev/null
+++ b/src/Splat.DependencyInjection.SourceGenerator.Tests/RegisterLazySingletonTests.LazyParameterRegisteredLazy_contract=.01.verified.cs
@@ -0,0 +1,19 @@
+//HintName: Splat.DI.Extensions.Registrations.SourceGenerated.cs
+
+// <auto-generated />
+namespace Splat
+{
+    internal static partial class SplatRegistrations
+    {
+        static partial void SetupIOCInternal( Splat.IDependencyResolver resolver) 
+        {
+            Splat.Locator.CurrentMutable.Register(() => new global::Test.TestConcrete((global::Test.IService1)resolver.GetService(typeof(global::Test.IService1)), (global::System.Lazy<global::Test.IService2>)resolver.GetService(typeof(global::System.Lazy<global::Test.IService2>))){ ServiceProperty1=(global::Test.IServiceProperty1)resolver.GetService(typeof(global::Test.IServiceProperty1)), ServiceProperty2=(global::Test.IServiceProperty2)resolver.GetService(typeof(global::Test.IServiceProperty2)), ServiceProperty3=(global::Test.IServiceProperty3)resolver.GetService(typeof(global::Test.IServiceProperty3))} , typeof(global::Test.ITest));
+            Splat.Locator.CurrentMutable.Register(() => new global::Test.Service1(), typeof(global::Test.IService1));
+            {
+                global::System.Lazy<Test.IService2> lazy = new global::System.Lazy<Test.IService2>(() => new global::Test.Service2());
+                Splat.Locator.CurrentMutable.Register(() => lazy, typeof(global::System.Lazy<Test.IService2>));
+                Splat.Locator.CurrentMutable.Register(() => lazy.Value, typeof(global::Test.IService2));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Splat.DependencyInjection.SourceGenerator.Tests/RegisterLazySingletonTests.LazyParameterRegisteredLazy_contract=Test1.00.verified.cs b/src/Splat.DependencyInjection.SourceGenerator.Tests/RegisterLazySingletonTests.LazyParameterRegisteredLazy_contract=Test1.00.verified.cs
new file mode 100644
index 0000000..c0f90b4
--- /dev/null
+++ b/src/Splat.DependencyInjection.SourceGenerator.Tests/RegisterLazySingletonTests.LazyParameterRegisteredLazy_contract=Test1.00.verified.cs
@@ -0,0 +1,149 @@
+//HintName: Splat.DI.Extensions.SourceGenerated.cs
+
+// <auto-generated />
+namespace Splat
+{
+    /// <summary>
+    /// Extension methods for the Splat DI source generator.
+    /// </summary>
+    internal static partial class SplatRegistrations
+    {
+        /// <summary>
+        /// Registers a class with its concrete class.
+        /// </summary>
+        public static void Register<TInterface, TConcrete>()
+        {
+        }
+
+        /// <summary>
+        /// Registers a class with its concrete class.
+        /// </summary>
+        /// <param name="contract">Optional contract.</param>
+        public static void Register<TInterface, TConcrete>(string contract)
+        {
+        }
+
+        /// <summary>
+        /// Registers a class with its concrete class.
+        /// </summary>
+        public static void RegisterLazySingleton<TInterface, TConcrete>()
+        {
+        }
+
+        /// <summary>
+        /// Registers a class with its concrete class.
+        /// </summary>
+        /// <param name="mode">The threading mode.</param>
+        public static void RegisterLazySingleton<TInterface, TConcrete>(System.Threading.LazyThreadSafetyMode mode)
+        {
+        }
+
+        /// <summary>
+        /// Registers a class with its concrete class.
+        /// </summary>
+        /// <param name="contract">Optional contract.</param>
+        public static void RegisterLazySingleton<TInterface, TConcrete>(string contract)
+        {
+        }
+
+        /// <summary>
+        /// Registers a class with its concrete class.
+        /// </summary>
+        /// <param name="contract">Optional contract.</param>
+        /// <param name="mode">The threading mode.</param>
+        public static void RegisterLazySingleton<TInterface, TConcrete>(string contract, System.Threading.LazyThreadSafetyMode mode)
+        {
+        }
+
+        /// <summary>
+        /// Registers a class with its concrete class.
+        /// </summary>
+        public static void Register<T>()
+        {
+        }
+
+
+        /// <summary>
+        /// Registers a class with its concrete class.
+        /// </summary>
+        /// <param name="contract">Optional contract.</param>
+        public static void Register<T>(string contract)
+        {
+        }
+
+        /// <summary>
+        /// Registers a lazy class with its concrete class.
+        /// </summary>
+        public static void RegisterLazySingleton<T>()
+        {
+        }
+
+
+        /// <summary>
+        /// Registers a lazy class with its concrete class.
+        /// </summary>
+        /// <param name="contract">Optional contract.</param>
+        public static void RegisterLazySingleton<T>(string contract)
+        {
+        }
+
+        /// <summary>
+        /// Proxy for the Splat SetService.
+        /// </summary>
+        public static void RegisterConstant<T>(T instance) => Splat.Locator.CurrentMutable.RegisterConstant<T>(instance);
+
+        /// <summary>
+        /// Proxy for the Splat SetService.
+        /// </summary>
+        /// <param name="contract">Optional contract.</param>
+        public static void RegisterConstant<T>(T instance, string contract) => Splat.Locator.CurrentMutable.RegisterConstant<T>(instance, contract);
+
+        /// <summary>
+        /// Registers the registrations.
+        /// </summary>
+        public static void SetupIOC()
+        {
+            SetupIOCInternal(Splat.Locator.GetLocator());
+        }
+
+        /// <summary>
+        /// Registers the registrations.
+        /// </summary>
+        /// <param name="resolver">The resolver to register with.</param>
+        public static void SetupIOC(Splat.IDependencyResolver resolver)
+        {
+            SetupIOCInternal(resolver);
+        }
+
+
+        static partial void SetupIOCInternal(Splat.IDependencyResolver resolver);
+    }
+
+    /// <summary>
+    /// Makes the property get added by the DI engine.
+    /// </summary>
+    [System.AttributeUsage(System.AttributeTargets.Property)]
+    internal class DependencyInjectionPropertyAttribute : System.Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DependencyInjectionPropertyAttribute"/> class.
+        /// </summary>
+        public DependencyInjectionPropertyAttribute()
+        {
+        }
+    }
+
+    /// <summary>
+    /// Makes this the constructor used by the DI engine.
+    /// </summary>
+    [System.AttributeUsage(System.AttributeTargets.Constructor)]
+    internal class DependencyInjectionConstructorAttribute : System.Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DependencyInjectionConstructorAttribute"/> class.
+        /// </summary>
+        public DependencyInjectionConstructorAttribute()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Splat.DependencyInjection.SourceGenerator.Tests/RegisterLazySingletonTests.LazyParameterRegisteredLazy_contract=Test1.01.verified.cs b/src/Splat.DependencyInjection.SourceGenerator.Tests/RegisterLazySingletonTests.LazyParameterRegisteredLazy_contract=Test1.01.verified.cs
new file mode 100644
index 0000000..c3807e1
--- /dev/null
+++ b/src/Splat.DependencyInjection.SourceGenerator.Tests/RegisterLazySingletonTests.LazyParameterRegisteredLazy_contract=Test1.01.verified.cs
@@ -0,0 +1,19 @@
+//HintName: Splat.DI.Extensions.Registrations.SourceGenerated.cs
+
+// <auto-generated />
+namespace Splat
+{
+    internal static partial class SplatRegistrations
+    {
+        static partial void SetupIOCInternal( Splat.IDependencyResolver resolver) 
+        {
+            Splat.Locator.CurrentMutable.Register(() => new global::Test.TestConcrete((global::Test.IService1)resolver.GetService(typeof(global::Test.IService1)), (global::System.Lazy<global::Test.IService2>)resolver.GetService(typeof(global::System.Lazy<global::Test.IService2>))){ ServiceProperty1=(global::Test.IServiceProperty1)resolver.GetService(typeof(global::Test.IServiceProperty1)), ServiceProperty2=(global::Test.IServiceProperty2)resolver.GetService(typeof(global::Test.IServiceProperty2)), ServiceProperty3=(global::Test.IServiceProperty3)resolver.GetService(typeof(global::Test.IServiceProperty3))} , typeof(global::Test.ITest), "Test1");
+            Splat.Locator.CurrentMutable.Register(() => new global::Test.Service1(), typeof(global::Test.IService1), "Test1");
+            {
+                global::System.Lazy<Test.IService2> lazy = new global::System.Lazy<Test.IService2>(() => new global::Test.Service2());
+                Splat.Locator.CurrentMutable.Register(() => lazy, typeof(global::System.Lazy<Test.IService2>), "Test1");
+                Splat.Locator.CurrentMutable.Register(() => lazy.Value, typeof(global::Test.IService2), "Test1");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Splat.DependencyInjection.SourceGenerator.Tests/RegisterLazySingletonTests.LazyParameterRegisteredLazy_contract=Test2.00.verified.cs b/src/Splat.DependencyInjection.SourceGenerator.Tests/RegisterLazySingletonTests.LazyParameterRegisteredLazy_contract=Test2.00.verified.cs
new file mode 100644
index 0000000..c0f90b4
--- /dev/null
+++ b/src/Splat.DependencyInjection.SourceGenerator.Tests/RegisterLazySingletonTests.LazyParameterRegisteredLazy_contract=Test2.00.verified.cs
@@ -0,0 +1,149 @@
+//HintName: Splat.DI.Extensions.SourceGenerated.cs
+
+// <auto-generated />
+namespace Splat
+{
+    /// <summary>
+    /// Extension methods for the Splat DI source generator.
+    /// </summary>
+    internal static partial class SplatRegistrations
+    {
+        /// <summary>
+        /// Registers a class with its concrete class.
+        /// </summary>
+        public static void Register<TInterface, TConcrete>()
+        {
+        }
+
+        /// <summary>
+        /// Registers a class with its concrete class.
+        /// </summary>
+        /// <param name="contract">Optional contract.</param>
+        public static void Register<TInterface, TConcrete>(string contract)
+        {
+        }
+
+        /// <summary>
+        /// Registers a class with its concrete class.
+        /// </summary>
+        public static void RegisterLazySingleton<TInterface, TConcrete>()
+        {
+        }
+
+        /// <summary>
+        /// Registers a class with its concrete class.
+        /// </summary>
+        /// <param name="mode">The threading mode.</param>
+        public static void RegisterLazySingleton<TInterface, TConcrete>(System.Threading.LazyThreadSafetyMode mode)
+        {
+        }
+
+        /// <summary>
+        /// Registers a class with its concrete class.
+        /// </summary>
+        /// <param name="contract">Optional contract.</param>
+        public static void RegisterLazySingleton<TInterface, TConcrete>(string contract)
+        {
+        }
+
+        /// <summary>
+        /// Registers a class with its concrete class.
+        /// </summary>
+        /// <param name="contract">Optional contract.</param>
+        /// <param name="mode">The threading mode.</param>
+        public static void RegisterLazySingleton<TInterface, TConcrete>(string contract, System.Threading.LazyThreadSafetyMode mode)
+        {
+        }
+
+        /// <summary>
+        /// Registers a class with its concrete class.
+        /// </summary>
+        public static void Register<T>()
+        {
+        }
+
+
+        /// <summary>
+        /// Registers a class with its concrete class.
+        /// </summary>
+        /// <param name="contract">Optional contract.</param>
+        public static void Register<T>(string contract)
+        {
+        }
+
+        /// <summary>
+        /// Registers a lazy class with its concrete class.
+        /// </summary>
+        public static void RegisterLazySingleton<T>()
+        {
+        }
+
+
+        /// <summary>
+        /// Registers a lazy class with its concrete class.
+        /// </summary>
+        /// <param name="contract">Optional contract.</param>
+        public static void RegisterLazySingleton<T>(string contract)
+        {
+        }
+
+        /// <summary>
+        /// Proxy for the Splat SetService.
+        /// </summary>
+        public static void RegisterConstant<T>(T instance) => Splat.Locator.CurrentMutable.RegisterConstant<T>(instance);
+
+        /// <summary>
+        /// Proxy for the Splat SetService.
+        /// </summary>
+        /// <param name="contract">Optional contract.</param>
+        public static void RegisterConstant<T>(T instance, string contract) => Splat.Locator.CurrentMutable.RegisterConstant<T>(instance, contract);
+
+        /// <summary>
+        /// Registers the registrations.
+        /// </summary>
+        public static void SetupIOC()
+        {
+            SetupIOCInternal(Splat.Locator.GetLocator());
+        }
+
+        /// <summary>
+        /// Registers the registrations.
+        /// </summary>
+        /// <param name="resolver">The resolver to register with.</param>
+        public static void SetupIOC(Splat.IDependencyResolver resolver)
+        {
+            SetupIOCInternal(resolver);
+        }
+
+
+        static partial void SetupIOCInternal(Splat.IDependencyResolver resolver);
+    }
+
+    /// <summary>
+    /// Makes the property get added by the DI engine.
+    /// </summary>
+    [System.AttributeUsage(System.AttributeTargets.Property)]
+    internal class DependencyInjectionPropertyAttribute : System.Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DependencyInjectionPropertyAttribute"/> class.
+        /// </summary>
+        public DependencyInjectionPropertyAttribute()
+        {
+        }
+    }
+
+    /// <summary>
+    /// Makes this the constructor used by the DI engine.
+    /// </summary>
+    [System.AttributeUsage(System.AttributeTargets.Constructor)]
+    internal class DependencyInjectionConstructorAttribute : System.Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DependencyInjectionConstructorAttribute"/> class.
+        /// </summary>
+        public DependencyInjectionConstructorAttribute()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Splat.DependencyInjection.SourceGenerator.Tests/RegisterLazySingletonTests.LazyParameterRegisteredLazy_contract=Test2.01.verified.cs b/src/Splat.DependencyInjection.SourceGenerator.Tests/RegisterLazySingletonTests.LazyParameterRegisteredLazy_contract=Test2.01.verified.cs
new file mode 100644
index 0000000..7226579
--- /dev/null
+++ b/src/Splat.DependencyInjection.SourceGenerator.Tests/RegisterLazySingletonTests.LazyParameterRegisteredLazy_contract=Test2.01.verified.cs
@@ -0,0 +1,19 @@
+//HintName: Splat.DI.Extensions.Registrations.SourceGenerated.cs
+
+// <auto-generated />
+namespace Splat
+{
+    internal static partial class SplatRegistrations
+    {
+        static partial void SetupIOCInternal( Splat.IDependencyResolver resolver) 
+        {
+            Splat.Locator.CurrentMutable.Register(() => new global::Test.TestConcrete((global::Test.IService1)resolver.GetService(typeof(global::Test.IService1)), (global::System.Lazy<global::Test.IService2>)resolver.GetService(typeof(global::System.Lazy<global::Test.IService2>))){ ServiceProperty1=(global::Test.IServiceProperty1)resolver.GetService(typeof(global::Test.IServiceProperty1)), ServiceProperty2=(global::Test.IServiceProperty2)resolver.GetService(typeof(global::Test.IServiceProperty2)), ServiceProperty3=(global::Test.IServiceProperty3)resolver.GetService(typeof(global::Test.IServiceProperty3))} , typeof(global::Test.ITest), "Test2");
+            Splat.Locator.CurrentMutable.Register(() => new global::Test.Service1(), typeof(global::Test.IService1), "Test2");
+            {
+                global::System.Lazy<Test.IService2> lazy = new global::System.Lazy<Test.IService2>(() => new global::Test.Service2());
+                Splat.Locator.CurrentMutable.Register(() => lazy, typeof(global::System.Lazy<Test.IService2>), "Test2");
+                Splat.Locator.CurrentMutable.Register(() => lazy.Value, typeof(global::Test.IService2), "Test2");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Splat.DependencyInjection.SourceGenerator.Tests/RegisterLazySingletonTests.cs b/src/Splat.DependencyInjection.SourceGenerator.Tests/RegisterLazySingletonTests.cs
index b4c0485..6fd0b11 100644
--- a/src/Splat.DependencyInjection.SourceGenerator.Tests/RegisterLazySingletonTests.cs
+++ b/src/Splat.DependencyInjection.SourceGenerator.Tests/RegisterLazySingletonTests.cs
@@ -83,5 +83,67 @@ public interface IServiceProperty3 {{ }}
 
             return TestPass(source, contract, mode);
         }
+
+        [Theory]
+        [InlineData("")]
+        [InlineData("Test1")]
+        [InlineData("Test2")]
+        public Task LazyParameterRegisteredLazy(string contract)
+        {
+            string arguments;
+            if (string.IsNullOrWhiteSpace(contract))
+            {
+                arguments = string.Empty;
+            }
+            else
+            {
+                arguments = $"\"{contract}\"";
+            }
+
+            var source = @$"
+using System;
+using System.Threading;
+using Splat;
+
+namespace Test
+{{
+    public static class DIRegister
+    {{
+        static DIRegister()
+        {{
+            SplatRegistrations.Register<ITest, TestConcrete>({arguments});
+            SplatRegistrations.Register<IService1, Service1>({arguments});
+            SplatRegistrations.RegisterLazySingleton<IService2, Service2>({arguments});
+        }}
+    }}
+
+    public interface ITest {{ }}
+    public class TestConcrete : ITest
+    {{
+        public TestConcrete(IService1 service1, Lazy<IService2> service)
+        {{
+        }}
+
+        [DependencyInjectionProperty]
+        public IServiceProperty1 ServiceProperty1 {{ get; set; }}
+
+        [DependencyInjectionProperty]
+        public IServiceProperty2 ServiceProperty2 {{ get; set; }}
+
+        [DependencyInjectionProperty]
+        internal IServiceProperty3 ServiceProperty3 {{ get; set; }}
+    }}
+
+    public interface IService1 {{ }}
+    public class Service1 : IService1 {{ }}
+    public interface IService2 {{ }}
+    public class Service2 : IService2 {{ }}
+    public interface IServiceProperty1 {{ }}
+    public interface IServiceProperty2 {{ }}
+    public interface IServiceProperty3 {{ }}
+}}";
+
+            return TestPass(source, contract);
+        }
     }
 }
diff --git a/src/Splat.DependencyInjection.SourceGenerator/MetadataDependencyChecker.cs b/src/Splat.DependencyInjection.SourceGenerator/MetadataDependencyChecker.cs
index 259bd49..c38247d 100644
--- a/src/Splat.DependencyInjection.SourceGenerator/MetadataDependencyChecker.cs
+++ b/src/Splat.DependencyInjection.SourceGenerator/MetadataDependencyChecker.cs
@@ -49,7 +49,10 @@ public static List<MethodMetadata> CheckMetadata(GeneratorExecutionContext conte
                             {
                                 if (childConstructor.TypeName == metadataMethod.InterfaceTypeName)
                                 {
-                                    throw new ContextDiagnosticException(Diagnostic.Create(DiagnosticWarnings.ConstructorsMustNotHaveCircularDependency, childConstructor.Parameter.Locations.FirstOrDefault() ?? metadataMethod.MethodInvocation.GetLocation()));
+                                    throw new ContextDiagnosticException(
+                                        Diagnostic.Create(
+                                            DiagnosticWarnings.ConstructorsMustNotHaveCircularDependency,
+                                            childConstructor.Parameter.Locations.FirstOrDefault() ?? metadataMethod.MethodInvocation.GetLocation()));
                                 }
                             }
                         }
@@ -67,7 +70,15 @@ public static List<MethodMetadata> CheckMetadata(GeneratorExecutionContext conte
 
                             if (metadataDependencies.TryGetValue(lazyType.ToDisplayString(RoslynCommonHelpers.TypeFormat), out dependencyMethod))
                             {
-                                throw new ContextDiagnosticException(Diagnostic.Create(DiagnosticWarnings.LazyParameterNotRegisteredLazy, constructorDependency.Parameter.Locations.FirstOrDefault() ?? metadataMethod.MethodInvocation.GetLocation(), metadataMethod.ConcreteTypeName, constructorDependency.Parameter.Name));
+                                if (!dependencyMethod.IsLazy)
+                                {
+                                    throw new ContextDiagnosticException(
+                                        Diagnostic.Create(
+                                            DiagnosticWarnings.LazyParameterNotRegisteredLazy,
+                                            constructorDependency.Parameter.Locations.FirstOrDefault() ?? metadataMethod.MethodInvocation.GetLocation(),
+                                            metadataMethod.ConcreteTypeName,
+                                            constructorDependency.Parameter.Name));
+                                }
                             }
                         }
                     }