diff --git a/configuration.h b/configuration.h
index 3e0c2c8..1cf8fa1 100644
--- a/configuration.h
+++ b/configuration.h
@@ -215,7 +215,7 @@ expire-after:20M\n\
 // Upper limit
 #define HL_LOCK_AUTO_LIMIT_HIGH		(1<<20)
 
-#define HL_LOCK_NONPRIV_TRIES		(HL_LOCK_AUTO_LIMIT_HIGH << 6)
+#define HL_LOCK_NONPRIV_TRIES		(HL_LOCK_AUTO_LIMIT_HIGH << 8)
 
 //#define READWRITE_SIGNALLING
 
diff --git a/privileged.c b/privileged.c
index d9d835e..5dd7394 100644
--- a/privileged.c
+++ b/privileged.c
@@ -330,6 +330,7 @@ struct cmd_ret {
 	volatile struct pa_ret		 ret_buf;
 	volatile void			*ret;
 	volatile int			 _errno;
+	volatile int			 processing_longcmd;
 };
 volatile struct cmd		*cmd_p;
 volatile struct cmd_ret		*cmd_ret_p;
@@ -1162,7 +1163,9 @@ int privileged_handler(ctx_t *ctx_p)
 			case PA_WAITPID: {
 				struct pa_waitpid_arg *arg_p = (void *)&cmd_p->arg.waitpid;
 				debug(20, "PA_WAITPID(%u, 0x%o)", arg_p->pid, arg_p->options);
-				cmd_ret_p->ret = (void *)(long)waitpid(arg_p->pid, &arg_p->status, arg_p->options);
+				cmd_ret_p->processing_longcmd = 1;
+				cmd_ret_p->ret                = (void *)(long)waitpid(arg_p->pid, &arg_p->status, arg_p->options);
+				cmd_ret_p->processing_longcmd = 0;
 				break;
 			}
 			default:
@@ -1235,10 +1238,8 @@ static inline int privileged_action(
 				rc = ENOENT;
 				goto privileged_action_end;
 			}
-			if (++counter > HL_LOCK_NONPRIV_TRIES) {
+			if (cmd_ret_p->processing_longcmd && ++counter > HL_LOCK_NONPRIV_TRIES)
 				sleep(SLEEP_SECONDS);
-				counter = 0;
-			}
 		}
 	} else {
 #  endif
@@ -1312,10 +1313,8 @@ static inline int privileged_action(
 				rc = ENOENT;
 				goto privileged_action_end;
 			}
-			if (++counter > HL_LOCK_NONPRIV_TRIES) {
+			if (cmd_ret_p->processing_longcmd && ++counter > HL_LOCK_NONPRIV_TRIES)
 				sleep(SLEEP_SECONDS);
-				counter = 0;
-			}
 		}
 
 #  ifdef HL_LOCK_TRIES_AUTO