diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 124c43e..e9f58f4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -37,12 +37,14 @@
             </intent-filter>
         </service>
 
-        <service
-            android:name="com.emarsys.mobileengage.service.MobileEngageInstanceIdService">
-            <intent-filter>
-                <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
-            </intent-filter>
-        </service>
+        <!--If you have non-Emarsys related Push use cases,-->
+        <!--register your own service instead of EmarsysMessagingService.-->
+        <!--For a reference implementation, please take a look at com.emarsys.sample.CustomMessagingService-->
+        <!--<service android:name=".CustomMessagingService">-->
+        <!--<intent-filter>-->
+        <!--<action android:name="com.google.firebase.MESSAGING_EVENT" />-->
+        <!--</intent-filter>-->
+        <!--</service>-->
 
         <meta-data
             android:name="com.emarsys.mobileengage.small_notification_icon"
diff --git a/app/src/main/java/com/emarsys/mobileengage/sample/CustomMessagingService.java b/app/src/main/java/com/emarsys/mobileengage/sample/CustomMessagingService.java
new file mode 100644
index 0000000..07c38e6
--- /dev/null
+++ b/app/src/main/java/com/emarsys/mobileengage/sample/CustomMessagingService.java
@@ -0,0 +1,30 @@
+package com.emarsys.mobileengage.sample;
+
+import com.emarsys.mobileengage.MobileEngage;
+import com.emarsys.mobileengage.service.MessagingServiceUtils;
+import com.google.firebase.messaging.FirebaseMessagingService;
+import com.google.firebase.messaging.RemoteMessage;
+
+public class CustomMessagingService extends FirebaseMessagingService {
+
+    @Override
+    public void onNewToken(String token) {
+        super.onNewToken(token);
+
+        MobileEngage.setPushToken(token);
+    }
+
+    @Override
+    public void onMessageReceived(RemoteMessage remoteMessage) {
+        super.onMessageReceived(remoteMessage);
+
+        boolean handledByEmarsysSDK = MessagingServiceUtils.handleMessage(
+                this,
+                remoteMessage,
+                MobileEngage.getConfig().getOreoConfig());
+
+        if (!handledByEmarsysSDK) {
+            //handle your custom push message here
+        }
+    }
+}
\ No newline at end of file