diff --git a/source/backend/engine/CarlaEngine.cpp b/source/backend/engine/CarlaEngine.cpp
index 6c154fcfa..7a797e021 100644
--- a/source/backend/engine/CarlaEngine.cpp
+++ b/source/backend/engine/CarlaEngine.cpp
@@ -25,6 +25,21 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QTextStream>
 
+// -------------------------------------------------------------------------------------------------------------------
+// Register native engine plugin
+
+#ifndef BUILD_BRIDGE
+# include "CarlaNative.h"
+
+void carla_register_native_plugin_carla()
+{
+    CARLA_BACKEND_USE_NAMESPACE;
+    CarlaEngine::registerNativePlugin();
+}
+#endif
+
+// -------------------------------------------------------------------------------------------------------------------
+
 CARLA_BACKEND_START_NAMESPACE
 
 // -------------------------------------------------------------------------------------------------------------------
@@ -41,11 +56,6 @@ extern BinaryType CarlaPluginGetBridgeBinaryType(CarlaPlugin* const plugin);
 // -------------------------------------------------------------------------------------------------------------------
 // Engine Helpers
 
-void carla_register_native_plugin_carla()
-{
-    CarlaEngine::registerNativePlugin();
-}
-
 void registerEnginePlugin(CarlaEngine* const engine, const unsigned int id, CarlaPlugin* const plugin)
 {
     CarlaEngineProtectedData::registerEnginePlugin(engine, id, plugin);
diff --git a/source/backend/engine/CarlaEngineNative.cpp b/source/backend/engine/CarlaEngineNative.cpp
index ef0ee379e..05aade612 100644
--- a/source/backend/engine/CarlaEngineNative.cpp
+++ b/source/backend/engine/CarlaEngineNative.cpp
@@ -45,9 +45,6 @@ public:
         fOptions.preferPluginBridges = false;
         fOptions.preferUiBridges = false;
         init("Carla-Plugin");
-
-//         if (! addPlugin(PLUGIN_INTERNAL, nullptr, nullptr, "PingPongPan"))
-//             carla_stderr2("Plugin add Pan failed");
     }
 
     ~CarlaEngineNative() override