diff --git a/ui/StatusQ/CMakeLists.txt b/ui/StatusQ/CMakeLists.txt
index eefb2adbe61..353d358c043 100644
--- a/ui/StatusQ/CMakeLists.txt
+++ b/ui/StatusQ/CMakeLists.txt
@@ -123,6 +123,8 @@ set_target_properties(StatusQ PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY_DEBUG ${STATUSQ_MODULE_PATH}
     RUNTIME_OUTPUT_DIRECTORY_RELEASE ${STATUSQ_MODULE_PATH}
     LIBRARY_OUTPUT_DIRECTORY ${STATUSQ_MODULE_PATH}
+    CXX_STANDARD 17
+    CXX_STANDARD_REQUIRED ON
 )
 
 if (APPLE)
diff --git a/ui/StatusQ/src/wallet/managetokenscontroller.cpp b/ui/StatusQ/src/wallet/managetokenscontroller.cpp
index 037c131ff14..ea9bccf9e3c 100644
--- a/ui/StatusQ/src/wallet/managetokenscontroller.cpp
+++ b/ui/StatusQ/src/wallet/managetokenscontroller.cpp
@@ -201,11 +201,8 @@ bool ManageTokensController::hasSettings() const
 
 bool ManageTokensController::lessThan(const QString& lhsSymbol, const QString& rhsSymbol) const
 {
-    int leftPos, rightPos;
-    bool leftVisible, rightVisible;
-
-    std::tie(leftPos, leftVisible, std::ignore) = m_settingsData.value(lhsSymbol, {INT_MAX, false, QString()});
-    std::tie(rightPos, rightVisible, std::ignore) = m_settingsData.value(rhsSymbol, {INT_MAX, false, QString()});
+    auto [leftPos, leftVisible, leftGroup] = m_settingsData.value(lhsSymbol, {INT_MAX, false, QString()});
+    auto [rightPos, rightVisible, rightGroup] = m_settingsData.value(rhsSymbol, {INT_MAX, false, QString()});
 
     // check if visible
     leftPos = leftVisible ? leftPos : INT_MAX;