diff --git a/changelog/unreleased/4967 b/changelog/unreleased/4967
new file mode 100644
index 00000000000..13df984c35c
--- /dev/null
+++ b/changelog/unreleased/4967
@@ -0,0 +1,6 @@
+Bugfix: Hide keyboard and clear error when brute-force countdown ends
+
+The number keyboard has been hidden during the brute-force protection countdown so users cannot interact with it. The wrong-passcode error message has been cleared once the countdown ends, leaving a clean screen for the next attempt.
+
+https://github.com/owncloud/android/issues/4874
+https://github.com/owncloud/android/pull/4967
diff --git a/owncloudApp/src/main/java/com/owncloud/android/presentation/security/passcode/PassCodeActivity.kt b/owncloudApp/src/main/java/com/owncloud/android/presentation/security/passcode/PassCodeActivity.kt
index cb3157e39b1..b1996e9ce98 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/presentation/security/passcode/PassCodeActivity.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/presentation/security/passcode/PassCodeActivity.kt
@@ -228,6 +228,8 @@ class PassCodeActivity : ToolbarActivity(), NumberKeyboardListener, EnableBiomet
         })
         passCodeViewModel.getFinishedTimeToUnlockLiveData.observe(this, Event.EventObserver {
             binding.lockTime.visibility = View.INVISIBLE
+            binding.numberKeyboard.visibility = View.VISIBLE
+            binding.passcodeError.visibility = View.INVISIBLE
             for (editText: EditText? in passCodeEditTexts) {
                 editText?.isEnabled = true
             }
@@ -347,6 +349,7 @@ class PassCodeActivity : ToolbarActivity(), NumberKeyboardListener, EnableBiomet
         val timeToUnlock = passCodeViewModel.getTimeToUnlockLeft()
         if (timeToUnlock > 0) {
             binding.lockTime.visibility = View.VISIBLE
+            binding.numberKeyboard.visibility = View.INVISIBLE
             for (editText: EditText? in passCodeEditTexts) {
                 editText?.isEnabled = false
             }