diff --git a/ios/RNFirebase/RNFirebaseAnalytics.m b/ios/RNFirebase/RNFirebaseAnalytics.m
index d4157534..6a9ac1c4 100644
--- a/ios/RNFirebase/RNFirebaseAnalytics.m
+++ b/ios/RNFirebase/RNFirebaseAnalytics.m
@@ -1,58 +1,41 @@
 #import "RNFirebase.h"
-#import "RNFirebaseEvents.h"
 #import "RNFirebaseAnalytics.h"
-#import "Firebase.h"
+
+#if __has_include(<FirebaseAnalytics/FIRAnalytics.h>)
+#import <FirebaseAnalytics/FIRAnalytics.h>
+#import <FirebaseAnalytics/FIRAnalyticsConfiguration.h>
 
 @implementation RNFirebaseAnalytics
-- (void)dealloc
-{
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
-RCT_EXPORT_MODULE(RNFirebaseAnalytics);
-
-// Implementation
-RCT_EXPORT_METHOD(logEvent:(NSString *)name
-                  props:(NSDictionary *)props)
-{
-  NSString *debugMsg = [NSString stringWithFormat:@"%@: %@ with %@",
-                          @"RNFirebaseAnalytics", name, props];
-  [[RNFirebase sharedInstance] debugLog:@"logEventWithName called"
-                                   msg:debugMsg];
+RCT_EXPORT_MODULE();
 
+RCT_EXPORT_METHOD(logEvent:(NSString *)name props:(NSDictionary *)props) {
   [FIRAnalytics logEventWithName:name parameters:props];
 }
 
-RCT_EXPORT_METHOD(setAnalyticsCollectionEnabled:(BOOL) enabled)
-{
+RCT_EXPORT_METHOD(setAnalyticsCollectionEnabled:(BOOL) enabled) {
   [[FIRAnalyticsConfiguration sharedInstance] setAnalyticsCollectionEnabled:enabled];
 }
 
-RCT_EXPORT_METHOD(setCurrentScreen:(NSString *) screenName
-                       screenClass:(NSString *) screenClassOverriew)
-{
+RCT_EXPORT_METHOD(setCurrentScreen:(NSString *) screenName screenClass:(NSString *) screenClassOverriew) {
   [FIRAnalytics setScreenName:screenName screenClass:screenClassOverriew];
 }
 
-RCT_EXPORT_METHOD(setMinimumSessionDuration:(nonnull NSNumber *) milliseconds)
-{
-  //Not implemented on iOS
-}
-
-RCT_EXPORT_METHOD(setSessionTimeoutDuration:(nonnull NSNumber *) milliseconds)
-{
-  //Not implemented on iOS
-}
-
-RCT_EXPORT_METHOD(setUserId: (NSString *) id)
-{
+RCT_EXPORT_METHOD(setUserId: (NSString *) id) {
   [FIRAnalytics setUserID:id];
 }
 
-RCT_EXPORT_METHOD(setUserProperty: (NSString *) name
-  value:(NSString *) value)
-{
+RCT_EXPORT_METHOD(setUserProperty: (NSString *) name value:(NSString *) value) {
   [FIRAnalytics setUserPropertyString:value forName:name];
 }
 
+// not implemented on iOS sdk
+RCT_EXPORT_METHOD(setMinimumSessionDuration:(nonnull NSNumber *) milliseconds) {}
+RCT_EXPORT_METHOD(setSessionTimeoutDuration:(nonnull NSNumber *) milliseconds) {}
 @end
+
+#else
+@implementation RNFirebaseAnalytics
+RCT_EXPORT_MODULE();
+RCT_EXPORT_METHOD(nativeSDKMissing) {}
+@end
+#endif