diff --git a/public/app/percona/add-instance/components/AddRemoteInstance/AddRemoteInstance.tsx b/public/app/percona/add-instance/components/AddRemoteInstance/AddRemoteInstance.tsx
index 57ec0184d72f..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.pgStatements;
+    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/AddRemoteInstance.types.ts b/public/app/percona/add-instance/components/AddRemoteInstance/AddRemoteInstance.types.ts
index 9fb2d218dbb9..a8de85474a45 100644
--- a/public/app/percona/add-instance/components/AddRemoteInstance/AddRemoteInstance.types.ts
+++ b/public/app/percona/add-instance/components/AddRemoteInstance/AddRemoteInstance.types.ts
@@ -3,7 +3,7 @@ import { RemoteInstanceCredentials, InstanceAvailable, SelectInstance } from 'ap
 export interface FormValues extends RemoteInstanceCredentials {
   qan_mysql_perfschema?: boolean;
   disable_comments_parsing?: boolean;
-  tracking?: 'qan_postgresql_pgstatements_agent';
+  tracking?: TrackingOptions;
 }
 
 export enum TrackingOptions {