diff --git a/aosp_beryllium.mk b/aosp_beryllium.mk
index 71d0564..4980f6e 100644
--- a/aosp_beryllium.mk
+++ b/aosp_beryllium.mk
@@ -6,6 +6,10 @@
 # https://github.com/pundiramit/linux/tree/android-5.4-modules
 LOCAL_MODS := $(wildcard $(LOCAL_KERNEL_DIR)/*.ko)
 BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(DB845C_MODS)
+# Skip copying modules broken on android-5.4
+# Use local module copy instead
+SKIP_MODS := %/msm.ko
+BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(filter-out $(SKIP_MODS),$(DB845C_MODS))
 BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(LOCAL_MODS)
 
 # Inherit the full_base and device configurations
diff --git a/prebuilt-kernel/android-5.4/msm.ko b/prebuilt-kernel/android-5.4/msm.ko
new file mode 100644
index 0000000..fd0ce77
--- /dev/null
+++ b/prebuilt-kernel/android-5.4/msm.ko
Binary files differ