diff --git a/internal/controller/api_vms_ip.go b/internal/controller/api_vms_ip.go
index 8fbb7bf..1f612ec 100644
--- a/internal/controller/api_vms_ip.go
+++ b/internal/controller/api_vms_ip.go
@@ -20,7 +20,7 @@ func (controller *Controller) ip(ctx *gin.Context) responder.Responder {
 	// Retrieve and parse path and query parameters
 	name := ctx.Param("name")
 
-	waitRaw := ctx.Query("wait")
+	waitRaw := ctx.DefaultQuery("wait", "0")
 	wait, err := strconv.ParseUint(waitRaw, 10, 16)
 	if err != nil {
 		return responder.Code(http.StatusBadRequest)
diff --git a/internal/controller/api_vms_portforward.go b/internal/controller/api_vms_portforward.go
index 14228d1..2516174 100644
--- a/internal/controller/api_vms_portforward.go
+++ b/internal/controller/api_vms_portforward.go
@@ -33,7 +33,7 @@ func (controller *Controller) portForwardVM(ctx *gin.Context) responder.Responde
 		return responder.Code(http.StatusBadRequest)
 	}
 
-	waitRaw := ctx.Query("wait")
+	waitRaw := ctx.DefaultQuery("wait", "0")
 	wait, err := strconv.ParseUint(waitRaw, 10, 16)
 	if err != nil {
 		return responder.Code(http.StatusBadRequest)