diff --git a/CODEOWNERS b/CODEOWNERS
index 1216214d0b..a9c561df73 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -308,7 +308,6 @@ gnu/packages/lxqt\.scm                             @guix/lxqt
 
 gnu/packages/mate\.scm                             @guix/mate
 
-
 gnu/build/icecat-extension\.scm                    @guix/mozilla
 gnu/packages/browser-extensions\.scm               @guix/mozilla
 gnu/packages/gnuzilla\.scm                         @guix/mozilla
diff --git a/etc/teams.scm b/etc/teams.scm
index 4697a60124..6b8e88583c 100755
--- a/etc/teams.scm
+++ b/etc/teams.scm
@@ -1833,8 +1833,12 @@ and REV-END, two git revision strings."
 # usually suited as a reviewer.\n\n"
              port)
     (for-each (lambda (team)
-                (display (team->codeowners-snippet team) port)
-                (newline port))
+                (let ((scope (team->codeowners-snippet team)))
+                  ;; Some teams, like Mentors and Community have no scope,
+                  ;; which would result in seemingly arbitrary newlines.
+                  (unless (string-null? scope)
+                    (display scope port)
+                    (newline port))))
               teams)))