diff --git a/src/NHibernate.Test/Async/NHSpecificTest/GH3424/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/GH3424/Fixture.cs
new file mode 100644
index 00000000000..ef60ff14aac
--- /dev/null
+++ b/src/NHibernate.Test/Async/NHSpecificTest/GH3424/Fixture.cs
@@ -0,0 +1,60 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by AsyncGenerator.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+using System.Collections.Generic;
+using System.Linq;
+using NHibernate.Linq;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.GH3424
+{
+	using System.Threading.Tasks;
+	[TestFixture]
+	public class FixtureAsync : BugTestCase
+	{
+		protected override void OnSetUp()
+		{
+			using var session = OpenSession();
+			using var transaction = session.BeginTransaction();
+
+			var c1 = new Child { Name = "Rob" };
+			session.Save(c1);
+			var e1 = new Entity { Name = "Bob", Children = new HashSet<Child> { c1 } };
+			session.Save(e1);
+
+			transaction.Commit();
+		}
+
+		protected override void OnTearDown()
+		{
+			using var session = OpenSession();
+			using var transaction = session.BeginTransaction();
+			session.CreateQuery("delete Child").ExecuteUpdate();
+			session.CreateQuery("delete from System.Object").ExecuteUpdate();
+
+			transaction.Commit();
+		}
+
+		[Test]
+		public async Task QueryingAfterFutureThenClearAsync()
+		{
+			using var session = OpenSession();
+			using var transaction = session.BeginTransaction();
+			var futureBob = session.Query<Entity>().Where(e => e.Name == "Bob").ToFutureValue(q => q.FirstOrDefault());
+			var bob = await (futureBob.GetValueAsync());
+			Assert.That(bob, Is.Not.Null);
+			session.Clear();
+
+			var allQuery = session.Query<Entity>();
+			Assert.That(() => allQuery.ToListAsync(), Has.Count.EqualTo(1));
+			await (transaction.CommitAsync());
+		}
+	}
+}
diff --git a/src/NHibernate.Test/NHSpecificTest/GH3424/Entities.cs b/src/NHibernate.Test/NHSpecificTest/GH3424/Entities.cs
new file mode 100644
index 00000000000..e72fe68c43c
--- /dev/null
+++ b/src/NHibernate.Test/NHSpecificTest/GH3424/Entities.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+
+namespace NHibernate.Test.NHSpecificTest.GH3424
+{
+	class Entity
+	{
+		public virtual Guid Id { get; set; }
+		public virtual string Name { get; set; }
+		public virtual ISet<Child> Children { get; set; }
+	}
+
+	class Child
+	{
+		public virtual Guid Id { get; set; }
+		public virtual string Name { get; set; }
+	}
+}
diff --git a/src/NHibernate.Test/NHSpecificTest/GH3424/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/GH3424/Fixture.cs
new file mode 100644
index 00000000000..5c829ce5c2d
--- /dev/null
+++ b/src/NHibernate.Test/NHSpecificTest/GH3424/Fixture.cs
@@ -0,0 +1,49 @@
+using System.Collections.Generic;
+using System.Linq;
+using NHibernate.Linq;
+using NUnit.Framework;
+
+namespace NHibernate.Test.NHSpecificTest.GH3424
+{
+	[TestFixture]
+	public class Fixture : BugTestCase
+	{
+		protected override void OnSetUp()
+		{
+			using var session = OpenSession();
+			using var transaction = session.BeginTransaction();
+
+			var c1 = new Child { Name = "Rob" };
+			session.Save(c1);
+			var e1 = new Entity { Name = "Bob", Children = new HashSet<Child> { c1 } };
+			session.Save(e1);
+
+			transaction.Commit();
+		}
+
+		protected override void OnTearDown()
+		{
+			using var session = OpenSession();
+			using var transaction = session.BeginTransaction();
+			session.CreateQuery("delete Child").ExecuteUpdate();
+			session.CreateQuery("delete from System.Object").ExecuteUpdate();
+
+			transaction.Commit();
+		}
+
+		[Test]
+		public void QueryingAfterFutureThenClear()
+		{
+			using var session = OpenSession();
+			using var transaction = session.BeginTransaction();
+			var futureBob = session.Query<Entity>().Where(e => e.Name == "Bob").ToFutureValue(q => q.FirstOrDefault());
+			var bob = futureBob.Value;
+			Assert.That(bob, Is.Not.Null);
+			session.Clear();
+
+			var allQuery = session.Query<Entity>();
+			Assert.That(() => allQuery.ToList(), Has.Count.EqualTo(1));
+			transaction.Commit();
+		}
+	}
+}
diff --git a/src/NHibernate.Test/NHSpecificTest/GH3424/Mappings.hbm.xml b/src/NHibernate.Test/NHSpecificTest/GH3424/Mappings.hbm.xml
new file mode 100644
index 00000000000..e692e287c11
--- /dev/null
+++ b/src/NHibernate.Test/NHSpecificTest/GH3424/Mappings.hbm.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" assembly="NHibernate.Test"
+                   namespace="NHibernate.Test.NHSpecificTest.GH3424">
+
+  <class name="Entity">
+    <id name="Id" generator="guid.comb"/>
+    <property name="Name"/>
+    <set name="Children" lazy="false">
+      <key column="EntityId"/>
+      <one-to-many class="Child" />
+    </set>
+  </class>
+  
+  <class name="Child">
+    <id name="Id" generator="guid.comb"/>
+    <property name="Name"/>
+  </class>
+
+</hibernate-mapping>
diff --git a/src/NHibernate/Engine/StatefulPersistenceContext.cs b/src/NHibernate/Engine/StatefulPersistenceContext.cs
index 7819a59989b..f912c9b8bdc 100644
--- a/src/NHibernate/Engine/StatefulPersistenceContext.cs
+++ b/src/NHibernate/Engine/StatefulPersistenceContext.cs
@@ -264,6 +264,7 @@ public void Clear()
 			entityEntries.Clear();
 			entitySnapshotsByKey.Clear();
 			collectionsByKey.Clear();
+			nonlazyCollections.Clear();
 			collectionEntries.Clear();
 			if (unownedCollections != null)
 			{