diff --git a/configure.ac b/configure.ac
index c9e202f870..e443d75bbc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2737,7 +2737,6 @@ AC_DEFINE_UNQUOTED([YANG_MODELS_PATH], ["$CFG_YANGMODELS"], [path to YANG data m
 AC_DEFINE_UNQUOTED([WATCHFRR_SH_PATH], ["${CFG_SBIN%/}/watchfrr.sh"], [path to watchfrr.sh])
 
 AC_DEFINE_UNQUOTED([LDPD_SOCKET], ["$CFG_STATE%s%s/ldpd.sock"], [ldpd control socket])
-AC_DEFINE_UNQUOTED([ZEBRA_SERV_PATH], ["$CFG_STATE%s%s/zserv.api"], [zebra api socket])
 AC_DEFINE_UNQUOTED([OSPFD_GR_STATE], ["$CFG_STATE%s/ospfd-gr.json"], [ospfd GR state information])
 AC_DEFINE_UNQUOTED([OSPF6D_GR_STATE], ["$CFG_STATE/ospf6d-gr.json"], [ospf6d GR state information])
 AC_DEFINE_UNQUOTED([ISISD_RESTART], ["$CFG_STATE%s/isid-restart.json"], [isisd restart information])
diff --git a/lib/libfrr.c b/lib/libfrr.c
index e4c3f905e9..8f655eab0d 100644
--- a/lib/libfrr.c
+++ b/lib/libfrr.c
@@ -56,7 +56,7 @@ char frr_protoname[256] = "NONE";
 char frr_protonameinst[256] = "NONE";
 
 char config_default[512];
-char frr_zclientpath[256];
+char frr_zclientpath[512];
 static char pidfile_default[1024];
 #ifdef HAVE_SQLITE3
 static char dbfile_default[512];
@@ -343,8 +343,7 @@ void frr_preinit(struct frr_daemon_info *daemon, int argc, char **argv)
 		 frr_sysconfdir, di->name);
 	snprintf(pidfile_default, sizeof(pidfile_default), "%s/%s.pid",
 		 frr_runstatedir, di->name);
-	snprintf(frr_zclientpath, sizeof(frr_zclientpath),
-		 ZEBRA_SERV_PATH, "", "");
+	snprintf(frr_zclientpath, sizeof(frr_zclientpath), ZAPI_SOCK_NAME);
 #ifdef HAVE_SQLITE3
 	snprintf(dbfile_default, sizeof(dbfile_default), "%s/%s.db",
 		 frr_dbdir, di->name);
@@ -496,13 +495,13 @@ static int frr_opt(int opt)
 		}
 		di->pathspace = optarg;
 
-		if (!di->zpathspace)
-			snprintf(frr_zclientpath, sizeof(frr_zclientpath),
-				 ZEBRA_SERV_PATH, "/", di->pathspace);
 		snprintf(frr_runstatedir, sizeof(frr_runstatedir),
 			 FRR_RUNSTATE_PATH "/%s", di->pathspace);
 		snprintf(pidfile_default, sizeof(pidfile_default), "%s/%s.pid",
 			 frr_runstatedir, di->name);
+		if (!di->zpathspace)
+			snprintf(frr_zclientpath, sizeof(frr_zclientpath),
+				 ZAPI_SOCK_NAME);
 		break;
 	case 'o':
 		vrf_set_default_name(optarg);
diff --git a/lib/libfrr.h b/lib/libfrr.h
index ef262c236c..c981c297d1 100644
--- a/lib/libfrr.h
+++ b/lib/libfrr.h
@@ -22,6 +22,8 @@
 extern "C" {
 #endif
 
+#define ZAPI_SOCK_NAME "%s/zserv.api", frr_runstatedir
+
 /* The following options disable specific command line options that
  * are not applicable for a particular daemon.
  */
@@ -169,7 +171,7 @@ DECLARE_KOOH(frr_fini, (), ());
 extern void frr_fini(void);
 
 extern char config_default[512];
-extern char frr_zclientpath[256];
+extern char frr_zclientpath[512];
 extern const char frr_sysconfdir[];
 extern char frr_runstatedir[256];
 extern const char frr_moduledir[];