diff --git a/public/app/percona/add-instance/components/AddRemoteInstance/AddRemoteInstance.service.tsx b/public/app/percona/add-instance/components/AddRemoteInstance/AddRemoteInstance.service.tsx
index 472356633d86..01393ad13ddf 100644
--- a/public/app/percona/add-instance/components/AddRemoteInstance/AddRemoteInstance.service.tsx
+++ b/public/app/percona/add-instance/components/AddRemoteInstance/AddRemoteInstance.service.tsx
@@ -128,9 +128,11 @@ export const toPayload = (values: any, discoverName?: string, type?: InstanceAva
   }
 
   if (!values.isAzure) {
-    if (data.tracking === TrackingOptions.pgStatements) {
+    if (data.isRDS && data.tracking === TrackingOptions.pgStatements) {
+      data.qan_postgresql_pgstatements = true;
+    } else if (!data.isRDS && data.tracking === TrackingOptions.pgStatements) {
       data.qan_postgresql_pgstatements_agent = true;
-    } else if (data.tracking === TrackingOptions.pgMonitor) {
+    } else if (!data.isRDS && data.tracking === TrackingOptions.pgMonitor) {
       data.qan_postgresql_pgstatmonitor_agent = true;
     }
   }
@@ -168,11 +170,7 @@ export const toPayload = (values: any, discoverName?: string, type?: InstanceAva
 
   if (values.isAzure) {
     data.node_name = data.service_name;
-    if (
-      data.tracking === TrackingOptions.pgStatements ||
-      data.tracking === TrackingOptions.pgMonitor ||
-      data.qan_mysql_perfschema
-    ) {
+    if (data.tracking === TrackingOptions.pgStatements || data.qan_mysql_perfschema) {
       data.qan = true;
     }
   }
diff --git a/public/app/percona/add-instance/components/AddRemoteInstance/AddRemoteInstance.tsx b/public/app/percona/add-instance/components/AddRemoteInstance/AddRemoteInstance.tsx
index c6dda8392656..e9893d7335c7 100644
--- a/public/app/percona/add-instance/components/AddRemoteInstance/AddRemoteInstance.tsx
+++ b/public/app/percona/add-instance/components/AddRemoteInstance/AddRemoteInstance.tsx
@@ -55,7 +55,10 @@ const AddRemoteInstance: FC<AddRemoteInstanceProps> = ({
   }
 
   if (type === Databases.postgresql) {
-    initialValues.tracking = TrackingOptions.pgMonitor;
+    initialValues.tracking =
+      remoteInstanceCredentials.isAzure || remoteInstanceCredentials.isRDS
+        ? TrackingOptions.pgStatements
+        : TrackingOptions.pgMonitor;
     initialValues.disable_comments_parsing = true;
   }
 
diff --git a/public/app/percona/add-instance/components/AddRemoteInstance/FormParts/AdditionalOptions/AdditionalOptions.tsx b/public/app/percona/add-instance/components/AddRemoteInstance/FormParts/AdditionalOptions/AdditionalOptions.tsx
index 323d12d755d1..82ecdc8a1cf6 100644
--- a/public/app/percona/add-instance/components/AddRemoteInstance/FormParts/AdditionalOptions/AdditionalOptions.tsx
+++ b/public/app/percona/add-instance/components/AddRemoteInstance/FormParts/AdditionalOptions/AdditionalOptions.tsx
@@ -9,7 +9,7 @@ import { RadioButtonGroupField } from 'app/percona/shared/components/Form/RadioB
 import { Databases } from 'app/percona/shared/core';
 import { validators as platformCoreValidators } from 'app/percona/shared/helpers/validatorsForm';
 
-import { trackingOptions } from '../FormParts.constants';
+import { rdsTrackingOptions, trackingOptions } from '../FormParts.constants';
 import { Messages } from '../FormParts.messages';
 import { getStyles } from '../FormParts.styles';
 import { AdditionalOptionsFormPartProps, PostgreSQLAdditionalOptionsProps } from '../FormParts.types';
@@ -41,7 +41,7 @@ export const AdditionalOptionsFormPart: FC<AdditionalOptionsFormPartProps> = ({
   );
 };
 
-export const PostgreSQLAdditionalOptions: FC<PostgreSQLAdditionalOptionsProps> = ({ form }) => {
+export const PostgreSQLAdditionalOptions: FC<PostgreSQLAdditionalOptionsProps> = ({ form, isRDS, isAzure }) => {
   const selectedOption = form.getState()?.values?.autoDiscoveryOptions;
   const [selectedValue, setSelectedValue] = useState<string>(selectedOption || AutoDiscoveryOptionsInterface.enabled);
   const styles = useStyles2(getStyles);
@@ -62,7 +62,7 @@ export const PostgreSQLAdditionalOptions: FC<PostgreSQLAdditionalOptionsProps> =
       <RadioButtonGroupField
         name="tracking"
         data-testid="tracking-options-radio-button-group"
-        options={trackingOptions}
+        options={isRDS || isAzure ? rdsTrackingOptions : trackingOptions}
         className={styles.radioField}
         fullWidth
       />
diff --git a/public/app/percona/add-instance/components/AddRemoteInstance/FormParts/FormParts.constants.ts b/public/app/percona/add-instance/components/AddRemoteInstance/FormParts/FormParts.constants.ts
index 7c3eba41d253..03b62a0bf733 100644
--- a/public/app/percona/add-instance/components/AddRemoteInstance/FormParts/FormParts.constants.ts
+++ b/public/app/percona/add-instance/components/AddRemoteInstance/FormParts/FormParts.constants.ts
@@ -5,6 +5,11 @@ import { TrackingOptions } from '../AddRemoteInstance.types';
 
 import { MetricsParameters, Schema } from './FormParts.types';
 
+export const rdsTrackingOptions = [
+  { value: TrackingOptions.none, label: Messages.form.trackingOptions.none },
+  { value: TrackingOptions.pgStatements, label: Messages.form.trackingOptions.pgStatements },
+];
+
 export const trackingOptions = [
   { value: TrackingOptions.none, label: Messages.form.trackingOptions.none },
   { value: TrackingOptions.pgStatements, label: Messages.form.trackingOptions.pgStatements },