diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go
index 6c1917d..ca4af09 100644
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@@ -1254,7 +1254,8 @@ func (h *Handlers) SetDefaultVoucher(ctx context.Context, sym string, input []by
 			// Fetch vouchers from the API using the public key
 			vouchersResp, err := h.accountService.FetchVouchers(ctx, string(publicKey))
 			if err != nil {
-				return res, err
+				res.FlagSet = append(res.FlagSet, flag_no_active_voucher)
+				return res, nil
 			}
 
 			// Return if there is no voucher
diff --git a/remote/accountservice.go b/remote/accountservice.go
index 73052f6..2e19de1 100644
--- a/remote/accountservice.go
+++ b/remote/accountservice.go
@@ -202,7 +202,6 @@ func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKRespons
 	if len(okResponse.Result) == 0 {
 		return nil, errors.New("Empty api result")
 	}
-	return &okResponse, nil
 
 	v, err := json.Marshal(okResponse.Result)
 	if err != nil {
diff --git a/services/registration/no_voucher b/services/registration/no_voucher
index 332f00e..6303197 100644
--- a/services/registration/no_voucher
+++ b/services/registration/no_voucher
@@ -1 +1 @@
-You need a voucher to send
\ No newline at end of file
+You need a voucher to proceed
\ No newline at end of file
diff --git a/services/registration/no_voucher_swa b/services/registration/no_voucher_swa
index 66e8f26..7291650 100644
--- a/services/registration/no_voucher_swa
+++ b/services/registration/no_voucher_swa
@@ -1 +1 @@
-Unahitaji sarafu kutuma
\ No newline at end of file
+Unahitaji sarafu kuendelea
\ No newline at end of file
diff --git a/services/registration/select_voucher.vis b/services/registration/select_voucher.vis
index 08aa434..058d791 100644
--- a/services/registration/select_voucher.vis
+++ b/services/registration/select_voucher.vis
@@ -1,3 +1,4 @@
+CATCH no_voucher flag_no_active_voucher 1
 LOAD get_vouchers 0
 MAP get_vouchers
 MOUT back 0