diff --git a/arm_compute/core/CL/gemm/native/CLGEMMNativeKernelConfiguration.h b/arm_compute/core/CL/gemm/native/CLGEMMNativeKernelConfiguration.h
index 7d0e7c9..763c27b 100644
--- a/arm_compute/core/CL/gemm/native/CLGEMMNativeKernelConfiguration.h
+++ b/arm_compute/core/CL/gemm/native/CLGEMMNativeKernelConfiguration.h
@@ -45,13 +45,9 @@
      */
     static std::unique_ptr<ICLGEMMKernelConfiguration> create(GPUTarget arch)
     {
-        switch(get_arch_from_target(arch))
-        {
-            case GPUTarget::BIFROST:
-                return support::cpp14::make_unique<CLGEMMNativeKernelConfigurationBifrost>(arch);
-            default:
-                return nullptr;
-        }
+        // Note: At the moment we only support Bifrost architecture. However, we should have a dedicated path for each GPU architecture
+        // using get_arch_from_target(arch)
+        return support::cpp14::make_unique<CLGEMMNativeKernelConfigurationBifrost>(arch);
     }
 };
 } // namespace cl_gemm