diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index c0845da7f..3076df61b 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -457,7 +457,6 @@ ChoicePage::continueApplyDeviceChoice()
     Q_EMIT deviceChosen();
 }
 
-
 void
 ChoicePage::onActionChanged()
 {
@@ -466,6 +465,15 @@ ChoicePage::onActionChanged()
     {
         applyActionChoice( m_config->installChoice() );
     }
+
+    // Whole disk encryption isn't implemented for zfs so disable the option for now
+    if ( m_eraseFsTypesChoiceComboBox != nullptr && m_enableEncryptionWidget ) {
+        if ( m_eraseFsTypesChoiceComboBox->currentText() == "zfs" ) {
+            m_encryptWidget->hide();
+        } else {
+            m_encryptWidget->show();
+        }
+    }
 }
 
 void