diff --git a/src/libgui/ClusterInterfaceWidget.cpp b/src/libgui/ClusterInterfaceWidget.cpp
index 5fa6a1db0..2c00966ad 100644
--- a/src/libgui/ClusterInterfaceWidget.cpp
+++ b/src/libgui/ClusterInterfaceWidget.cpp
@@ -24,10 +24,13 @@
 */
 
 #include "ClusterInterfaceWidget.h"
+#include "FWBSettings.h"
 #include "ui_ClusterInterfaceWidget.h"
+
 #include <QSpacerItem>
 #include <QDebug>
 
+
 using namespace libfwbuilder;
 using namespace std;
 
@@ -183,7 +186,7 @@ ClusterInterfaceData ClusterInterfaceWidget::getInterfaceData()
     return res;
 }
 
-bool ClusterInterfaceWidget::interfaceSelectable(libfwbuilder::Interface* iface)
+bool ClusterInterfaceWidget::interfaceSelectable(Interface* iface)
 {
     libfwbuilder::Cluster cluster;
 //    cluster.add(iface, false);
@@ -198,11 +201,16 @@ bool ClusterInterfaceWidget::interfaceSelectable(libfwbuilder::Interface* iface)
         interfacePropertiesObjectFactory::getInterfacePropertiesObject(
             os_family));
     QString err;
-    bool res = int_prop->validateInterface(dynamic_cast<FWObject*>(&cluster),
-                                           dynamic_cast<FWObject*>(iface), false, err)
-                   && int_prop->isEligibleForCluster(iface);
+    bool res = true;
+    if (st->getBool("Objects/Interface/autoconfigureInterfaces"))
+        res = int_prop->validateInterface(&cluster, iface, false, err);
+    if (res)
+        res = int_prop->isEligibleForCluster(iface);
+
     if (fwbdebug)
-        qDebug() << "interface" << iface->getName().c_str() << "can be used in cluster:" << res;
+        qDebug() << "interface"
+                 << iface->getName().c_str()
+                 << "can be used in cluster:" << res;
     return res;
 }