diff --git a/src/device.c b/src/device.c
index df1e7825e1dc6cb8586f8d13d4f68d92283a1970..b9de3eeba5ab70a1b2d2efef3aacaca97ddf70fb 100644
--- a/src/device.c
+++ b/src/device.c
@@ -2209,7 +2209,8 @@ fprint_device_enroll_start (FprintDBusDevice      *dbus_dev,
   priv->enroll_data = finger;
   priv->current_action = ACTION_ENROLL;
 
-  if (!fp_device_has_feature (priv->dev, FP_DEVICE_FEATURE_STORAGE_LIST) &&
+  if (fp_device_has_feature (priv->dev, FP_DEVICE_FEATURE_STORAGE) &&
+      !fp_device_has_feature (priv->dev, FP_DEVICE_FEATURE_STORAGE_LIST) &&
       is_first_enrollment (rdev))
     {
       g_autoptr(GError) clear_err = NULL;