diff --git a/app/src/main/java/org/wikipedia/captcha/CaptchaHandler.kt b/app/src/main/java/org/wikipedia/captcha/CaptchaHandler.kt
index 47ce994bcf6..da4fd4ef4ef 100644
--- a/app/src/main/java/org/wikipedia/captcha/CaptchaHandler.kt
+++ b/app/src/main/java/org/wikipedia/captcha/CaptchaHandler.kt
@@ -41,8 +41,8 @@ class CaptchaHandler(private val activity: AppCompatActivity, private val wiki:
         return captchaResult?.captchaId
     }
 
-    fun captchaWord(): String {
-        return binding.captchaText.editText?.text.toString()
+    fun captchaWord(): String? {
+        return if (isActive) binding.captchaText.editText?.text.toString() else null
     }
 
     fun dispose() {
diff --git a/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.kt b/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.kt
index c78019c05f6..583deb87463 100644
--- a/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.kt
+++ b/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.kt
@@ -152,8 +152,8 @@ class CreateAccountActivity : BaseActivity() {
         val repeat = getText(binding.createAccountPasswordRepeat)
         disposables.add(ServiceFactory.get(wiki).postCreateAccount(getText(binding.createAccountUsername), password, repeat, token, Service.WIKIPEDIA_URL,
                 email,
-                if (captchaHandler.isActive) captchaHandler.captchaId() else "null",
-                if (captchaHandler.isActive) captchaHandler.captchaWord() else "null")
+                captchaHandler.captchaId().toString(),
+                captchaHandler.captchaWord().toString())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe({ response ->
diff --git a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.kt b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.kt
index 2771b631c84..d3118db0d90 100644
--- a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.kt
+++ b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.kt
@@ -337,10 +337,9 @@ class DescriptionEditFragment : Fragment() {
                         ServiceFactory.get(wikiSite).postEditSubmit(pageTitle.prefixedText, "0", null,
                             editSummary,
                             AccountUtil.assertUser, text, null, baseRevId, editToken,
-                            if (captchaHandler.isActive) captchaHandler.captchaId() else null,
-                            if (captchaHandler.isActive) captchaHandler.captchaWord() else null, tags = getEditTags()
-                        )
-                            .subscribeOn(Schedulers.io())
+                            captchaHandler.captchaId(),
+                            captchaHandler.captchaWord(), tags = getEditTags()
+                        ).subscribeOn(Schedulers.io())
                     }
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe({ result ->
diff --git a/app/src/main/java/org/wikipedia/edit/EditSectionActivity.kt b/app/src/main/java/org/wikipedia/edit/EditSectionActivity.kt
index afa3870f410..3420b591a95 100644
--- a/app/src/main/java/org/wikipedia/edit/EditSectionActivity.kt
+++ b/app/src/main/java/org/wikipedia/edit/EditSectionActivity.kt
@@ -307,8 +307,8 @@ class EditSectionActivity : BaseActivity(), ThemeChooserDialog.Callback, EditPre
         disposables.add(ServiceFactory.get(pageTitle.wikiSite).postEditSubmit(pageTitle.prefixedText,
                 if (sectionID >= 0) sectionID.toString() else null, null, summaryText, AccountUtil.assertUser,
                 binding.editSectionText.text.toString(), null, currentRevision, token,
-                if (captchaHandler.isActive) captchaHandler.captchaId() else "null",
-                if (captchaHandler.isActive) captchaHandler.captchaWord() else "null",
+                captchaHandler.captchaId().toString(),
+                captchaHandler.captchaWord().toString(),
                 isMinorEdit,
                 watchThisPage,
                 tags = getEditTag())