diff --git a/usr/share/archboot/base/etc/modprobe.d/modprobe.conf b/usr/share/archboot/base/etc/modprobe.d/modprobe.conf
index 9193cd4b4..1e8154670 100644
--- a/usr/share/archboot/base/etc/modprobe.d/modprobe.conf
+++ b/usr/share/archboot/base/etc/modprobe.d/modprobe.conf
@@ -1,4 +1,10 @@
 #
 # /etc/modprobe.d/modprobe.conf
 #
+
 blacklist floppy
+
+blacklist efivars
+blacklist efi_pstore
+
+options efi_pstore pstore_disable=1
diff --git a/usr/share/archboot/installer/setup b/usr/share/archboot/installer/setup
index 7b25935c5..ab237531f 100755
--- a/usr/share/archboot/installer/setup
+++ b/usr/share/archboot/installer/setup
@@ -3578,6 +3578,20 @@ detect_uefi_boot() {
     
     detect_uefi_secure_boot
     
+    if [[ "${_DETECTED_UEFI_BOOT}" == "1" ]]; then
+        if [[ ! "$(grep 'blacklist efivars' "${DESTDIR}/etc/modprobe.d/modprobe.conf")" ]]; then
+            echo 'blacklist efivars' >> "${DESTDIR}/etc/modprobe.d/modprobe.conf"
+        fi
+        
+        if [[ ! "$(grep 'blacklist efi_pstore' "${DESTDIR}/etc/modprobe.d/modprobe.conf")" ]]; then
+            echo 'blacklist efi_pstore' >> "${DESTDIR}/etc/modprobe.d/modprobe.conf"
+        fi
+        
+        if [[ ! "$(grep 'options efi_pstore pstore_disable=1' "${DESTDIR}/etc/modprobe.d/modprobe.conf")" ]]; then
+            echo 'options efi_pstore pstore_disable=1' >> "${DESTDIR}/etc/modprobe.d/modprobe.conf"
+        fi
+    fi
+    
 }
 
 do_uefi_setup_env_vars() {