diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
index c047e1bde1d..d655ed3ec8a 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -525,7 +525,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
         );
       } else if (
         dbToUpdate?.parameters?.query === '' &&
-        'query' in dbModel.parameters
+        'query' in dbModel.parameters.properties
       ) {
         dbToUpdate.parameters.query = {};
       }