diff --git a/bindings/python/ns3modulegen.py b/bindings/python/ns3modulegen.py
index e3dd6790b..12363b1e4 100755
--- a/bindings/python/ns3modulegen.py
+++ b/bindings/python/ns3modulegen.py
@@ -142,6 +142,10 @@ def main():
             root_module.classes.remove(root_module['ns3::%s' % clsname])
         root_module.enums.remove(root_module['ns3::RealtimeSimulatorImpl::SynchronizationMode'])
 
+    if 'TapBridge' not in enabled_features:
+        for clsname in ['TapBridge', 'TapBridgeHelper']:
+            root_module.classes.remove(root_module['ns3::%s' % clsname])
+
     root_module.generate(out, '_ns3')
 
     out.close()