diff --git a/tools/build/onos-prepare-sonar b/tools/build/onos-prepare-sonar
index 47d1ece..a47282a 100755
--- a/tools/build/onos-prepare-sonar
+++ b/tools/build/onos-prepare-sonar
@@ -61,6 +61,7 @@
 
 # Find all onos OSGi jar file rules
 targets = runCmd(["bazel", "query", "kind('_bnd', '//...')"])
+targets = [target for target in targets if not target in black_list]
 # Uncomment this for easier debugging of a single package
 # targets = ['//core/net:onos-core-net']
 
@@ -83,8 +84,6 @@
 
 
 def write_module(target, out):
-    if target in black_list:
-        return
     path, module_name = splitTarget(target)
     out.write('%s.sonar.projectBaseDir=%s\n' % (module_name, path))
     out.write('%(name)s.sonar.projectName=%(name)s\n' % {'name': module_name})