diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go
index d4cd430..87447e7 100644
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@@ -452,12 +452,12 @@ func (h *Handlers) CheckAccountStatus(ctx context.Context, sym string, input []b
 // Quit displays the Thank you message and exits the menu
 func (h *Handlers) Quit(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	res := resource.Result{}
-	switch codeFromCtx(ctx) {
-	case "swa":
-		res.Content = "Asante kwa kutumia huduma ya Sarafu. Kwaheri!"
-	default:
-		res.Content = "Thank you for using Sarafu. Goodbye!"
-	}
+
+	code := codeFromCtx(ctx)
+	l := gotext.NewLocale(translationDir, code)
+	l.AddDomain("default")
+	
+	res.Content = l.Get("Thank you for using Sarafu. Goodbye!")
 	res.FlagReset = append(res.FlagReset, models.USERFLAG_ACCOUNT_UNLOCKED)
 	return res, nil
 }
diff --git a/services/registration/locale/swa/default.po b/services/registration/locale/swa/default.po
index 12f6e6c..0a63d07 100644
--- a/services/registration/locale/swa/default.po
+++ b/services/registration/locale/swa/default.po
@@ -3,3 +3,6 @@ msgstr "Salio lako ni %s"
 
 msgid "Your request has been sent. %s will receive %s from %s."
 msgstr "Ombi lako limetumwa. %s atapokea %s kutoka kwa %s."
+
+msgid "Thank you for using Sarafu. Goodbye!"
+msgstr "Asante kwa kutumia huduma ya Sarafu. Kwaheri!"