diff --git a/packages/fcl-web/src/webdata/sqldbwebdata.pp b/packages/fcl-web/src/webdata/sqldbwebdata.pp
index 150b921df3..33b1d7f8e1 100644
--- a/packages/fcl-web/src/webdata/sqldbwebdata.pp
+++ b/packages/fcl-web/src/webdata/sqldbwebdata.pp
@@ -126,10 +126,13 @@ end;
 
 procedure TCustomSQLDBWebDataProvider.SQLChanged(Sender: TObject);
 begin
-  If (Sender=SelectSQL) and Assigned(FQuery) then
+  If (Sender=SelectSQL)  then
     begin
-    FQuery.Close;
-    FQuery.SQL.Assign(SelectSQL);
+    if Assigned(FQuery) then
+      begin
+      FQuery.Close;
+      FQuery.SQL.Assign(SelectSQL);
+      end;
     If Not (csLoading in ComponentState) then
       RegenerateParams;
     end;