diff --git a/usr/share/archboot/installer/setup b/usr/share/archboot/installer/setup
index b466e426e..abdeb3b2c 100755
--- a/usr/share/archboot/installer/setup
+++ b/usr/share/archboot/installer/setup
@@ -2362,8 +2362,12 @@ dogrub() {
         sync
         # freeze xfs filesystems to enable grub installation on xfs filesystems
         if [ -x /usr/sbin/xfs_freeze ]; then
-            /usr/sbin/xfs_freeze -f $DESTDIR/boot > /dev/null 2>&1
-            /usr/sbin/xfs_freeze -f $DESTDIR/ > /dev/null 2>&1
+            if [ $(cat /proc/mounts | grep "$DESTDIR/boot " | grep " xfs ") ]; then
+                /usr/sbin/xfs_freeze -f $DESTDIR/boot > /dev/null 2>&1
+            fi
+            if [ $(cat /proc/mounts | grep "$DESTDIR/ " | grep " xfs ") ]; then
+                /usr/sbin/xfs_freeze -f $DESTDIR/ > /dev/null 2>&1
+            fi
         fi
         # look for a separately-mounted /boot partition
         bootpart=$(mount | grep $DESTDIR/boot | cut -d' ' -f 1)
@@ -2399,8 +2403,12 @@ EOF
         cat /tmp/grub.log >$LOG
         # unfreeze xfs filesystems
         if [ -x /usr/sbin/xfs_freeze ]; then
-            /usr/sbin/xfs_freeze -u $DESTDIR/boot > /dev/null 2>&1
-            /usr/sbin/xfs_freeze -u $DESTDIR/ > /dev/null 2>&1
+            if [ $(cat /proc/mounts | grep "$DESTDIR/boot " | grep " xfs ") ]; then
+                /usr/sbin/xfs_freeze -u $DESTDIR/boot > /dev/null 2>&1
+            fi
+            if [ $(cat /proc/mounts | grep "$DESTDIR/ " | grep " xfs ") ]; then
+                /usr/sbin/xfs_freeze -u $DESTDIR/ > /dev/null 2>&1
+            fi
         fi
 
         if grep "Error [0-9]*: " /tmp/grub.log >/dev/null; then