diff --git a/yang/frr-staticd.yang b/yang/frr-staticd.yang
index 281b4903c0..98ff3a83c6 100644
--- a/yang/frr-staticd.yang
+++ b/yang/frr-staticd.yang
@@ -63,7 +63,13 @@ module frr-staticd {
 
   grouping staticd-prefix-attributes {
     list path-list {
-      key "distance";
+      key "table-id distance";
+      leaf table-id {
+        type uint32;
+        description
+          "Table-id";
+      }
+
       leaf distance {
         type frr-rt:administrative-distance;
         description
@@ -77,13 +83,6 @@ module frr-staticd {
           "Route tag";
       }
 
-      leaf table-id {
-        type uint32;
-        default "0";
-        description
-          "Table-id";
-      }
-
       uses frr-nexthop:frr-nexthop;
     }
   }