diff --git a/android/build.gradle b/android/build.gradle
index 9ff82888..5dad8a29 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -102,10 +102,10 @@ dependencies {
   implementation 'com.google.code.gson:gson:2.10.1'
   implementation 'com.facebook.react:react-native:0.71.3'
   implementation "com.daveanthonythomas.moshipack:moshipack:1.0.1"
-//   xmtp-android local testing setup below (comment org.xmtp:android above)
-   implementation files('<PATH>/xmtp-android/library/build/outputs/aar/library-debug.aar')
+  // xmtp-android local testing setup below (comment org.xmtp:android above)
+   implementation files('<PATH_TO_LIBRARY>/xmtp-android/library/build/outputs/aar/library-debug.aar')
    implementation 'com.google.crypto.tink:tink-android:1.8.0'
-     implementation 'io.grpc:grpc-kotlin-stub:1.4.1'
+   implementation 'io.grpc:grpc-kotlin-stub:1.4.1'
      implementation 'io.grpc:grpc-okhttp:1.62.2'
      implementation 'io.grpc:grpc-protobuf-lite:1.62.2'
      implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0'
diff --git a/android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt b/android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt
index 5767729f..38b4132b 100644
--- a/android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt
+++ b/android/src/main/java/expo/modules/xmtpreactnativesdk/XMTPModule.kt
@@ -85,7 +85,7 @@ class ReactNativeSigner(
     override var address: String,
     override var isSmartContractWallet: Boolean = false,
     override var chainId: Long = 1,
-    override var blockNumber: Long = 1,
+    override var blockNumber: Long? = null,
 ) : SigningKey {
     private val continuations: MutableMap<String, Continuation<Signature>> = mutableMapOf()
 
@@ -407,7 +407,7 @@ class XMTPModule : Module() {
                     address = address,
                     isSmartContractWallet = authOptions.isSmartContractWallet,
                     chainId = authOptions.chainId,
-                    blockNumber = authOptions.blockNumber ?: 1
+                    blockNumber = authOptions.blockNumber
                 )
                 signer = reactSigner
                 val options = clientOptions(