diff --git a/android/sample/build.gradle b/android/sample/build.gradle
index d27d3c761..920ed6d87 100644
--- a/android/sample/build.gradle
+++ b/android/sample/build.gradle
@@ -61,5 +61,4 @@ dependencies {
 
     implementation deps.okhttp3
     implementation project(':android')
-    implementation project(':fbjni')
 }
diff --git a/libs/fbjni/cxx/fbjni/detail/References.cpp b/libs/fbjni/cxx/fbjni/detail/References.cpp
index adefe6545..11d7561c6 100644
--- a/libs/fbjni/cxx/fbjni/detail/References.cpp
+++ b/libs/fbjni/cxx/fbjni/detail/References.cpp
@@ -54,7 +54,10 @@ bool doesGetObjectRefTypeWork() {
 }
 
 bool isObjectRefType(jobject reference, jobjectRefType refType) {
-  static bool getObjectRefTypeWorks = doesGetObjectRefTypeWork();
+
+// TODO Rather than setting it true, use doesGetObjectRefTypeWork(). But it
+// causes sample app to freeze
+  static bool getObjectRefTypeWorks = true;
 
   return
     !reference ||