diff --git a/packages/fcl-db/tests/testspecifictbufdataset.pas b/packages/fcl-db/tests/testspecifictbufdataset.pas
index fff549e4e4..78c1a11b78 100644
--- a/packages/fcl-db/tests/testspecifictbufdataset.pas
+++ b/packages/fcl-db/tests/testspecifictbufdataset.pas
@@ -53,6 +53,7 @@ type
     procedure TestAutoIncFieldStreamingXML;
     Procedure TestLocateScrollEventCount;
     Procedure TestLookupScrollEventCount;
+    procedure TestLookupEmpty;
     Procedure TestRecordCount;
     Procedure TestClear;
     procedure TestCopyFromDataset; //is copied dataset identical to original?
@@ -304,6 +305,22 @@ begin
 end;
 
 
+procedure TTestSpecificTBufDataset.TestLookupEmpty;
+
+// Test for issue 36086
+
+Var
+  V : Variant;
+
+begin
+  with DBConnector.GetNDataset(0) as TBufDataset do
+    begin
+    Open;
+    V:=Lookup('ID',5,'NAME');
+    AssertTrue('Null',Null=V);
+    end;
+end;
+
 procedure TTestSpecificTBufDataset.TestLookupScrollEventCount;
 
 Var