diff --git a/20-grub.install b/20-grub.install
index 8c6ae68..a6959c5 100755
--- a/20-grub.install
+++ b/20-grub.install
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+if ! [[ $KERNEL_INSTALL_MACHINE_ID ]]; then
+    exit 0
+fi
+
 [[ -f /etc/default/grub ]] && . /etc/default/grub
 [[ -f /etc/os-release ]] && . /etc/os-release
 
diff --git a/grub2.spec b/grub2.spec
index 166a4f5..4679073 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -7,7 +7,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.02
-Release:	37%{?dist}
+Release:	38%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 Group:		System Environment/Base
 License:	GPLv3+
@@ -453,6 +453,10 @@ fi
 %endif
 
 %changelog
+* Fri Jun 15 2018 Javier Martinez Canillas <javierm@redhat.com> - 2.02-38
+- Make 20-grub.install to exit if there is no machine ID set
+  Resolves: rhbz#1576573
+
 * Thu Jun 07 2018 Javier Martinez Canillas <javierm@redhat.com> - 2.02-37
 - More fixes for BLS
   Resolves: rhbz#1588184