diff --git a/android/src/main/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java b/android/src/main/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java
index 8361185073b0e674c003fd7e62e93e8be4d653d9..6cd354999f3f40a3822396e36bcfa8e7b69615fb 100644
--- a/android/src/main/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java
+++ b/android/src/main/java/com/evollu/react/fcm/FIRLocalMessagingHelper.java
@@ -109,11 +109,11 @@ public class FIRLocalMessagingHelper {
 
             //large icon
             String largeIcon = bundle.getString("large-icon");
-            if(largeIcon != null){
+            if(largeIcon != null && android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP){
                 int largeIconResId = res.getIdentifier(largeIcon, "mipmap", packageName);
                 Bitmap largeIconBitmap = BitmapFactory.decodeResource(res, largeIconResId);
 
-                if (largeIconResId != 0 && (largeIcon != null || android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP)) {
+                if (largeIconResId != 0) {
                     notification.setLargeIcon(largeIconBitmap);
                 }
             }
@@ -125,7 +125,7 @@ public class FIRLocalMessagingHelper {
             }
 
             //sound
-            if (bundle.containsKey("sound")) {
+            if (bundle.getString("sound") != null) {
                 int soundResourceId = res.getIdentifier(bundle.getString("sound"), "raw", packageName);
                 notification.setSound(Uri.parse("android.resource://" + packageName + "/" + soundResourceId));
             }