diff --git a/plugins/Common/IldaeilPlugin.cpp b/plugins/Common/IldaeilPlugin.cpp
index b5b3621..5d9d952 100644
--- a/plugins/Common/IldaeilPlugin.cpp
+++ b/plugins/Common/IldaeilPlugin.cpp
@@ -182,6 +182,10 @@ public:
     {
         switch (opcode)
         {
+        // cannnot be supported
+        case NATIVE_HOST_OPCODE_HOST_IDLE:
+            break;
+        // other stuff
         case NATIVE_HOST_OPCODE_NULL:
         case NATIVE_HOST_OPCODE_UPDATE_PARAMETER:
         case NATIVE_HOST_OPCODE_UPDATE_MIDI_PROGRAM:
@@ -189,7 +193,6 @@ public:
         case NATIVE_HOST_OPCODE_RELOAD_MIDI_PROGRAMS:
         case NATIVE_HOST_OPCODE_RELOAD_ALL:
         case NATIVE_HOST_OPCODE_UI_UNAVAILABLE:
-        case NATIVE_HOST_OPCODE_HOST_IDLE:
         case NATIVE_HOST_OPCODE_INTERNAL_PLUGIN:
         case NATIVE_HOST_OPCODE_QUEUE_INLINE_DISPLAY:
         case NATIVE_HOST_OPCODE_UI_TOUCH_PARAMETER:
diff --git a/plugins/Common/IldaeilUI.cpp b/plugins/Common/IldaeilUI.cpp
index 56e65ca..54473fe 100644
--- a/plugins/Common/IldaeilUI.cpp
+++ b/plugins/Common/IldaeilUI.cpp
@@ -138,6 +138,7 @@ class IldaeilUI : public UI,
     bool fPluginScanningFinished;
     bool fPluginHasCustomUI;
     bool fPluginHasEmbedUI;
+    bool fPluginWillRunInBridgeMode;
     PluginInfoCache* fPlugins;
     ScopedPointer<PluginGenericUI> fPluginGenericUI;
 
@@ -157,6 +158,7 @@ public:
           fPluginScanningFinished(false),
           fPluginHasCustomUI(false),
           fPluginHasEmbedUI(false),
+          fPluginWillRunInBridgeMode(false),
           fPlugins(nullptr),
           fPluginSearchActive(false)
     {
@@ -375,6 +377,8 @@ public:
             carla_replace_plugin(handle, 0);
         }
 
+        carla_set_engine_option(handle, ENGINE_OPTION_PREFER_PLUGIN_BRIDGES, fPluginWillRunInBridgeMode, nullptr);
+
         if (carla_add_plugin(handle, BINARY_NATIVE, fPluginType, nullptr, nullptr,
                              label, 0, 0x0, PLUGIN_OPTIONS_NULL))
         {
@@ -693,6 +697,9 @@ protected:
                 } while (false);
             }
 
+            ImGui::SameLine();
+            ImGui::Checkbox("Run in bridge mode", &fPluginWillRunInBridgeMode);
+
             if (carla_get_current_plugin_count(handle) != 0)
             {
                 ImGui::SameLine();