diff --git a/src/fs/luks.cpp b/src/fs/luks.cpp
index 61449dc..789d916 100644
--- a/src/fs/luks.cpp
+++ b/src/fs/luks.cpp
@@ -86,7 +86,7 @@ bool luks::supportToolFound() const
 {
     m_cryptsetupFound =
         m_GetLabel != cmdSupportNone &&
-        m_SetLabel != cmdSupportNone &&
+//         m_SetLabel != cmdSupportNone && (only m_innerFs labels are supported)
         m_Create != cmdSupportNone &&
         m_Check != cmdSupportNone &&
         m_UpdateUUID != cmdSupportNone &&
@@ -310,6 +310,7 @@ bool luks::cryptClose(const QString& deviceNode)
 
     m_passphrase.clear();
     setLabel({});
+    m_SetLabel = cmdSupportNone;
     setUUID(readUUID(deviceNode));
     setSectorsUsed(-1);
 
@@ -326,6 +327,7 @@ void luks::loadInnerFileSystem(const QString& mapperNode)
     FileSystem::Type innerFsType = detectFileSystem(mapperNode);
     m_innerFs = FileSystemFactory::cloneWithNewType(innerFsType,
                                                     *this);
+    m_SetLabel = cmdSupportFileSystem;
     setLabel(m_innerFs->readLabel(mapperNode));
     setUUID(m_innerFs->readUUID(mapperNode));
     if (m_innerFs->supportGetUsed() == FileSystem::cmdSupportFileSystem) // FIXME:also implement checking space if partition is mounted
diff --git a/src/plugins/libparted/libpartedbackend.cpp b/src/plugins/libparted/libpartedbackend.cpp
index eae3865..3ecf877 100644
--- a/src/plugins/libparted/libpartedbackend.cpp
+++ b/src/plugins/libparted/libpartedbackend.cpp
@@ -379,6 +379,7 @@ void LibPartedBackend::scanDevicePartitions(Device& d, PedDisk* pedDisk)
                 // in helpers.h for convenience.
                 mounted = isMounted(mapperNode);
             } else {
+                luksFs->m_SetLabel = FileSystem::cmdSupportNone;
                 mounted = false;
             }