diff --git a/source/plugin/carla-lv2-export.cpp b/source/plugin/carla-lv2-export.cpp
index 621eabf0c..e2a3e8853 100644
--- a/source/plugin/carla-lv2-export.cpp
+++ b/source/plugin/carla-lv2-export.cpp
@@ -545,8 +545,9 @@ static void writePluginFile(const NativePluginDescriptor* const pluginDesc)
     // -------------------------------------------------------------------
     // Parameters
 
-    const uint32_t paramCount((pluginHandle != nullptr && pluginDesc->get_parameter_count != nullptr) ? pluginDesc->get_parameter_count(pluginHandle) : 0);
-
+    const uint32_t paramCount = (pluginHandle != nullptr && pluginDesc->get_parameter_count != nullptr)
+                              ? pluginDesc->get_parameter_count(pluginHandle)
+                              : 0;
     if (paramCount > 0)
     {
         CARLA_SAFE_ASSERT_RETURN(pluginDesc->get_parameter_info != nullptr,)
diff --git a/source/plugin/carla-lv2.cpp b/source/plugin/carla-lv2.cpp
index 74c0b39d1..7d3e77d84 100644
--- a/source/plugin/carla-lv2.cpp
+++ b/source/plugin/carla-lv2.cpp
@@ -147,7 +147,8 @@ public:
         if (fDescriptor->get_parameter_count != nullptr &&
             fDescriptor->get_parameter_info  != nullptr &&
             fDescriptor->get_parameter_value != nullptr &&
-            fDescriptor->set_parameter_value != nullptr)
+            fDescriptor->set_parameter_value != nullptr &&
+            std::strncmp(fDescriptor->label, "carla", 5) != 0)
         {
             fPorts.numParams = fDescriptor->get_parameter_count(fHandle);
         }