diff --git a/applications/OptimizationApplication/custom_utilities/filtering/filter_utils.cpp b/applications/OptimizationApplication/custom_utilities/filtering/filter_utils.cpp
index 0efb627d198f..0d5e3d5076fe 100644
--- a/applications/OptimizationApplication/custom_utilities/filtering/filter_utils.cpp
+++ b/applications/OptimizationApplication/custom_utilities/filtering/filter_utils.cpp
@@ -24,24 +24,6 @@
 
 namespace Kratos {
 
-template<>
-const ModelPart::NodesContainerType& FilterUtils::GetContainer(const ModelPart& rModelPart)
-{
-    return rModelPart.Nodes();
-}
-
-template<>
-const ModelPart::ConditionsContainerType& FilterUtils::GetContainer(const ModelPart& rModelPart)
-{
-    return rModelPart.Conditions();
-}
-
-template<>
-const ModelPart::ElementsContainerType& FilterUtils::GetContainer(const ModelPart& rModelPart)
-{
-    return rModelPart.Elements();
-}
-
 std::vector<std::vector<const ModelPart*>> FilterUtils::GetComponentWiseDampedModelParts(
     Model& rModel,
     Parameters Settings,
diff --git a/applications/OptimizationApplication/custom_utilities/filtering/filter_utils.h b/applications/OptimizationApplication/custom_utilities/filtering/filter_utils.h
index 82024652b421..b6b29e4e50a9 100644
--- a/applications/OptimizationApplication/custom_utilities/filtering/filter_utils.h
+++ b/applications/OptimizationApplication/custom_utilities/filtering/filter_utils.h
@@ -15,6 +15,7 @@
 // System includes
 #include <vector>
 #include <unordered_map>
+#include <type_traits>
 
 // Project includes
 #include "containers/model.h"
@@ -67,7 +68,19 @@ class KRATOS_API(OPTIMIZATION_APPLICATION) FilterUtils {
         const IndexType NumberOfComponents);
 
     template<class TContainerType>
-    static const TContainerType& GetContainer(const ModelPart& rModelPart);
+    static const TContainerType& GetContainer(const ModelPart& rModelPart)
+    {
+        if constexpr(std::is_same_v<TContainerType, ModelPart::NodesContainerType>) {
+            return rModelPart.Nodes();
+        } else if constexpr(std::is_same_v<TContainerType, ModelPart::ConditionsContainerType>) {
+            return rModelPart.Conditions();
+        } else if constexpr(std::is_same_v<TContainerType, ModelPart::ElementsContainerType>) {
+            return rModelPart.Elements();
+        } else {
+            static_assert(!std::is_same_v<TContainerType, TContainerType>, "Unsupported TContainerType");
+            return TContainerType{};
+        }
+    }
 
     template<class TContainerType>
     static ContainerExpression<TContainerType> ComputeDampingCoefficientsBasedOnNearestEntity(