diff --git a/soliduiserver/soliduiserver.cpp b/soliduiserver/soliduiserver.cpp
index 0eb550d9..24ebc6c2 100644
--- a/soliduiserver/soliduiserver.cpp
+++ b/soliduiserver/soliduiserver.cpp
@@ -254,17 +254,17 @@ int SolidUiServer::unmountUdi(const QString &udi)
         return int(Solid::ErrorType::InvalidOption);
     }
 
-    const int unmountresult = unmountDevice(storageaccess->filePath());
-    if (unmountresult != int(Solid::ErrorType::NoError)) {
-        return unmountresult;
-    }
-
     bool isremovable = false;
     Solid::StorageDrive *storagedrive = device.as<Solid::StorageDrive>();
     if (storagedrive) {
         isremovable = (storagedrive->isHotpluggable() || storagedrive->isRemovable());
     }
 
+    const int unmountresult = unmountDevice(storageaccess->filePath());
+    if (unmountresult != int(Solid::ErrorType::NoError)) {
+        return unmountresult;
+    }
+
     if (storagevolume->usage() == Solid::StorageVolume::Encrypted) {
         QVariantMap cryptclosearguments;
         cryptclosearguments.insert("name", storagevolume->uuid());