diff --git a/src/sonic-yang-models/doc/Configuration.md b/src/sonic-yang-models/doc/Configuration.md
index cafc4fcaac1..088b4e545e9 100644
--- a/src/sonic-yang-models/doc/Configuration.md
+++ b/src/sonic-yang-models/doc/Configuration.md
@@ -2332,7 +2332,8 @@ and is listed in this table.
         "gnmi": {
             "client_auth": "true",
             "log_level": "2",
-            "port": "50051"
+            "port": "50051",
+            "save_on_set": "false"
         }
     }
 }
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/gnmi.json b/src/sonic-yang-models/tests/yang_model_tests/tests/gnmi.json
index 5938290f8a9..0d99fe09779 100644
--- a/src/sonic-yang-models/tests/yang_model_tests/tests/gnmi.json
+++ b/src/sonic-yang-models/tests/yang_model_tests/tests/gnmi.json
@@ -11,6 +11,10 @@
         "desc": "TABLE_WITH_INCORRECT_PORT failure.",
         "eStrKey": "InvalidValue"
     },
+    "GNMI_TABLE_WITH_INCORRECT_SAVE_ON_SET": {
+        "desc": "TABLE_WITH_INCORRECT_SAVE_ON_SET failure",
+        "eStrKey": "InvalidValue"
+    },
     "GNMI_TABLE_WITH_VALID_CONFIG": {
         "desc": "TABLE WITH VALID CONFIG."
     }
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/telemetry.json b/src/sonic-yang-models/tests/yang_model_tests/tests/telemetry.json
index f79e8ea7327..3329abd874e 100644
--- a/src/sonic-yang-models/tests/yang_model_tests/tests/telemetry.json
+++ b/src/sonic-yang-models/tests/yang_model_tests/tests/telemetry.json
@@ -11,6 +11,10 @@
         "desc": "TABLE_WITH_INCORRECT_PORT failure.",
         "eStrKey": "InvalidValue"
     },
+    "TELEMETRY_TABLE_WITH_INCORRECT_SAVE_ON_SET": {
+        "desc": "TABLE_WITH_INCORRECT_SAVE_ON_SET failure",
+        "eStrKey": "InvalidValue"
+    },
     "TELEMETRY_TABLE_WITH_VALID_CONFIG": {
         "desc": "TABLE WITH VALID CONFIG."
     }
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/gnmi.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/gnmi.json
index db121ae3944..62b09a2d5b0 100644
--- a/src/sonic-yang-models/tests/yang_model_tests/tests_config/gnmi.json
+++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/gnmi.json
@@ -47,6 +47,23 @@
             }
         }
     },
+    "GNMI_TABLE_WITH_INCORRECT_SAVE_ON_SET": {
+        "sonic-gnmi:sonic-gnmi": {
+            "sonic-gnmi:GNMI": {
+                "certs": {
+                    "ca_crt": "/etc/sonic/credentials/dsmsroot.cer",
+                    "server_crt": "/etc/sonic/credentials/server.cer",
+                    "server_key": "/etc/sonic/credentials/server.key"
+                },
+                "gnmi": {
+                    "client_auth": "true",
+                    "log_level": "2",
+                    "port": "50051",
+                    "save_on_set": "wrong"
+                }
+            }
+        }
+    },
     "GNMI_TABLE_WITH_VALID_CONFIG": {
         "sonic-gnmi:sonic-gnmi": {
             "sonic-gnmi:GNMI": {
@@ -58,7 +75,8 @@
                 "gnmi": {
                     "client_auth": "true",
                     "log_level": "2",
-                    "port": "50052"
+                    "port": "50052",
+                    "save_on_set": "false"
                 }
             }
         }
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/telemetry.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/telemetry.json
index 1231a4cee66..18e708262e7 100644
--- a/src/sonic-yang-models/tests/yang_model_tests/tests_config/telemetry.json
+++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/telemetry.json
@@ -47,6 +47,23 @@
             }
         }
     },
+    "TELEMETRY_TABLE_WITH_INCORRECT_SAVE_ON_SET": {
+        "sonic-telemetry:sonic-telemetry": {
+            "sonic-telemetry:TELEMETRY": {
+                "certs": {
+                    "ca_crt": "/etc/sonic/telemetry/dsmsroot.cer",
+                    "server_crt": "/etc/sonic/telemetry/streamingtelemetryserver.cer",
+                    "server_key": "/etc/sonic/telemetry/streamingtelemetryserver.key"
+                },
+                "gnmi": {
+                    "client_auth": "true",
+                    "log_level": "2",
+                    "port": "50051",
+                    "save_on_set": "wrong"
+                }
+            }
+        }
+    },
     "TELEMETRY_TABLE_WITH_VALID_CONFIG": {
         "sonic-telemetry:sonic-telemetry": {
             "sonic-telemetry:TELEMETRY": {
@@ -58,7 +75,8 @@
                 "gnmi": {
                     "client_auth": "true",
                     "log_level": "2",
-                    "port": "50051"
+                    "port": "50051",
+                    "save_on_set": "false"
                 }
             }
         }
diff --git a/src/sonic-yang-models/yang-models/sonic-gnmi.yang b/src/sonic-yang-models/yang-models/sonic-gnmi.yang
index 1d6b228266b..eb573e3ffe7 100644
--- a/src/sonic-yang-models/yang-models/sonic-gnmi.yang
+++ b/src/sonic-yang-models/yang-models/sonic-gnmi.yang
@@ -71,6 +71,11 @@ module sonic-gnmi {
                     description "Port gnmi runs on.";
                 }
 
+                leaf save_on_set {
+                    type boolean;
+                    description "Flag for enabling save on set.";
+                }
+
             }
 
         }
diff --git a/src/sonic-yang-models/yang-models/sonic-telemetry.yang b/src/sonic-yang-models/yang-models/sonic-telemetry.yang
index d3d7600a8e9..5cbdf2bd933 100644
--- a/src/sonic-yang-models/yang-models/sonic-telemetry.yang
+++ b/src/sonic-yang-models/yang-models/sonic-telemetry.yang
@@ -71,6 +71,11 @@ module sonic-telemetry {
                     description "Port gnmi runs on.";
                 }
 
+                leaf save_on_set {
+                    type boolean;
+                    description "Flag for enabling save on set.";
+                }
+
             }
 
         }