diff --git a/src/serv.c b/src/serv.c
index b6579be8..5228aa28 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -131,6 +131,9 @@ int serv_enable(char *arg)
 	char link[80];
 	char path[80];
 
+	if (!arg || !arg[0])
+		return serv_list(NULL);
+
 	if (!strstr(arg, ".conf")) {
 		snprintf(corr, sizeof(corr), "%s.conf", arg);
 		arg = corr;
@@ -154,6 +157,9 @@ int serv_disable(char *arg)
 	char link[80];
 	struct stat st;
 
+	if (!arg || !arg[0])
+		return serv_list(NULL);
+
 	if (!strstr(arg, ".conf")) {
 		snprintf(corr, sizeof(corr), "%s.conf", arg);
 		arg = corr;
@@ -173,6 +179,9 @@ int serv_touch(char *arg)
 {
 	char corr[40];
 
+	if (!arg || !arg[0])
+		return serv_list(NULL);
+
 	if (!strstr(arg, ".conf")) {
 		snprintf(corr, sizeof(corr), "%s.conf", arg);
 		arg = corr;