diff --git a/android/build.gradle b/android/build.gradle
index c462420..5f3e6bc 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -84,7 +84,7 @@ dependencies {
   // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
-  implementation ('io.github.middleware-labs:android-sdk:2.0.4')
+  implementation ('io.github.middleware-labs:android-sdk:2.0.5')
   implementation 'io.opentelemetry.android:instrumentation:+'
   implementation 'io.opentelemetry:opentelemetry-sdk:+'
   runtimeOnly 'io.opentelemetry:opentelemetry-semconv:1.30.1-alpha'
diff --git a/android/src/main/java/com/middlewarereactnative/MiddlewareReactNativeModule.java b/android/src/main/java/com/middlewarereactnative/MiddlewareReactNativeModule.java
index 0ad0fef..184c1af 100644
--- a/android/src/main/java/com/middlewarereactnative/MiddlewareReactNativeModule.java
+++ b/android/src/main/java/com/middlewarereactnative/MiddlewareReactNativeModule.java
@@ -80,9 +80,9 @@ public void initialize(ReadableMap configMap, Promise promise) {
       .setGlobalAttributes(attributesFromMap(globalAttributes))
       .setDeploymentEnvironment(deploymentEnvironment)
       .disableActivityLifecycleMonitoring()
-      .build(Objects.requireNonNull(getReactApplicationContext().getCurrentActivity()).getApplication());
+      .build((Application) getReactApplicationContext().getApplicationContext());
 
-    if("true".equals(sessionRecording)) {
+    if (Boolean.TRUE.toString().equals(sessionRecording)) {
       Middleware middleware = Middleware.getInstance();
       middleware.startNativeRecording(getCurrentActivity());
     }
@@ -103,7 +103,8 @@ public void nativeCrash() {
     new Thread(() -> {
       try {
         Thread.sleep(2000);
-      } catch (InterruptedException e) {}
+      } catch (InterruptedException e) {
+      }
       throw new RuntimeException("test crash");
     }).start();
   }
@@ -242,7 +243,7 @@ private ReactSpanProperties propertiesFromMap(SpanMapReader mapReader) {
 
     final ReadableArray readerEvents = mapReader.getEvents();
     final List<EventData> newEvents = new ArrayList<>();
-    for(int index = 0; index < readerEvents.size(); index++) {
+    for (int index = 0; index < readerEvents.size(); index++) {
       final ReadableMap readableMap = readerEvents.getMap(index);
       final EventData eventData = EventData.create(
         Long.parseLong(Objects.requireNonNull(readableMap.getString("time"))),