diff --git a/packages/fcl-db/src/base/bufdataset.pas b/packages/fcl-db/src/base/bufdataset.pas
index 720e790fea..313ce9c5ee 100644
--- a/packages/fcl-db/src/base/bufdataset.pas
+++ b/packages/fcl-db/src/base/bufdataset.pas
@@ -3028,7 +3028,7 @@ end;
 
 function TCustomBufDataset.GetIndexName: String;
 begin
-  if FIndexes.Count>0 then
+  if (FIndexes.Count>0) and (CurrentIndexBuf <> nil) then
     result := CurrentIndexBuf.Name
   else
     result := FIndexName;