diff --git a/android/manifest b/android/manifest
index 85afd77..ba2a213 100644
--- a/android/manifest
+++ b/android/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 5.1.0
+version: 5.1.1
 apiversion: 4
 architectures: arm64-v8a armeabi-v7a x86 x86_64
 description: titanium-firebase-analytics
diff --git a/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java b/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java
index 5038e75..b83d53b 100644
--- a/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java
+++ b/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java
@@ -108,7 +108,7 @@ public void setScreenNameAndScreenClass(KrollDict parameters)
 		}
 
 		final String screenName = parameters.getString("screenName");
-		final String screenClass = parameters.optString("screenClass", "TiController");
+		final String screenClass = parameters.getString("screenClass");
 		final FirebaseAnalytics instance = analyticsInstance();
 
 		getActivity().runOnUiThread(new Runnable() {