diff --git a/sounds/GoogleAudio.mk b/sounds/GoogleAudio.mk
index 66586fe..152119e 100644
--- a/sounds/GoogleAudio.mk
+++ b/sounds/GoogleAudio.mk
@@ -1,5 +1,6 @@
 LOCAL_PATH := vendor/google_pixel/sounds
 
+ifeq ($(filter %taimen %walleye,$(TARGET_PRODUCT)),)
 PRODUCT_PACKAGES += \
     SoundPickerPrebuilt
 
@@ -12,6 +13,7 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/material/alarms/Bright_morning.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/alarms/Bright_morning.ogg \
     $(LOCAL_PATH)/material/notifications/Popcorn.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/notifications/Popcorn.ogg \
     $(LOCAL_PATH)/material/ringtones/The_big_adventure.ogg:$(TARGET_COPY_OUT_PRODUCT)/media/audio/ringtones/The_big_adventure.ogg
+endif
 
 ifneq ($(GMS_MAKEFILE),gms_minimal.mk)
 PRODUCT_COPY_FILES += \