diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxCallbackBuilders.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxCallbackBuilders.kt
index d5bb53e9c9..ec30a31f6d 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxCallbackBuilders.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxCallbackBuilders.kt
@@ -24,7 +24,9 @@ import io.reactivex.Single
 fun <T> singleBuilder(builder: (MatrixCallback<T>) -> Cancelable): Single<T> = Single.create { emitter ->
     val callback = object : MatrixCallback<T> {
         override fun onSuccess(data: T) {
-            emitter.onSuccess(data)
+            // Add `!!` to fix the warning:
+            // "Type mismatch: type parameter with nullable bounds is used T is used where T was expected. This warning will become an error soon"
+            emitter.onSuccess(data!!)
         }
 
         override fun onFailure(failure: Throwable) {
diff --git a/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt b/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
index 378c7b853d..1aa4846f38 100644
--- a/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
@@ -74,6 +74,10 @@ class PinFragment @Inject constructor(
                 Toast.makeText(requireContext(), getString(R.string.create_pin_confirm_failure), Toast.LENGTH_SHORT).show()
             }
 
+            override fun onPinCodeEnteredFirst(pinCode: String?): Boolean {
+                return false
+            }
+
             override fun onCodeCreated(encodedCode: String) {
                 lifecycleScope.launch {
                     pinCodeStore.storeEncodedPin(encodedCode)