diff --git a/src/op_mode/dhcp.py b/src/op_mode/dhcp.py
index 4d6d092e69..6d5082012c 100755
--- a/src/op_mode/dhcp.py
+++ b/src/op_mode/dhcp.py
@@ -316,7 +316,7 @@ def _wrapper(*args, **kwargs):
 
 @_verify_server
 def show_server_pool_statistics(
-    raw: bool, family: ArgFamily, vrf: str, pool: typing.Optional[str]
+    raw: bool, family: ArgFamily, vrf: typing.Optional[str], pool: typing.Optional[str]
 ):
     v = 'v6' if family == 'inet6' else ''
     inet_suffix = '6' if family == 'inet6' else '4'
@@ -362,7 +362,7 @@ def show_server_pool_statistics(
 def show_server_leases(
     raw: bool,
     family: ArgFamily,
-    vrf: str,
+    vrf: typing.Optional[str],
     pool: typing.Optional[str],
     sorted: typing.Optional[str],
     state: typing.Optional[ArgState],
@@ -425,7 +425,7 @@ def show_server_leases(
 def show_server_static_mappings(
     raw: bool,
     family: ArgFamily,
-    vrf: str,
+    vrf: typing.Optional[str],
     pool: typing.Optional[str],
     sorted: typing.Optional[str],
 ):
@@ -478,7 +478,7 @@ def _lease_valid(inet, vrf, address):
 
 
 @_verify_server
-def clear_dhcp_server_lease(family: ArgFamily, vrf: str, address: str):
+def clear_dhcp_server_lease(family: ArgFamily, address: str, vrf: typing.Optional[str]):
     v = 'v6' if family == 'inet6' else ''
     inet = '6' if family == 'inet6' else '4'