diff --git a/source/main.pas b/source/main.pas
index 027d8e71..a7c88243 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -4023,9 +4023,12 @@ begin
 
     try
       ShowStatusMsg('Fetching rows ...');
-      if not Assigned(DataGridResult) then
+      // Result object must be of the right vendor type
+      if not RefreshingData then begin
+        FreeAndNil(DataGridResult);
         DataGridResult := DBObj.Connection.Parameters.CreateQuery(Self);
-      DataGridResult.Connection := ActiveConnection;
+      end;
+      DataGridResult.Connection := DBObj.Connection;
       DataGridResult.SQL := Select;
       DataGridResult.Execute(Offset > 0);
       DataGridResult.ColumnOrgNames := WantedColumnOrgnames;