diff --git a/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java b/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java
index 475041b..5038e75 100644
--- a/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java
+++ b/android/src/firebase/analytics/TitaniumFirebaseAnalyticsModule.java
@@ -116,7 +116,12 @@ public void setScreenNameAndScreenClass(KrollDict parameters)
 			public void run()
 			{
 				Bundle bundle = new Bundle(1);
-				bundle.putString(screenName, screenClass);
+
+				bundle.putString(FirebaseAnalytics.Param.SCREEN_NAME, screenName);
+				if (screenClass != null) {
+					bundle.putString(FirebaseAnalytics.Param.SCREEN_CLASS, screenClass);
+				}
+
 				instance.logEvent(FirebaseAnalytics.Event.SCREEN_VIEW, bundle);
 			}
 		});