diff --git a/library/system/setup b/library/system/setup
index c2e9d9792f9..5ae5ece8bad 100644
--- a/library/system/setup
+++ b/library/system/setup
@@ -2188,6 +2188,13 @@ class LinuxVirtual(Virtual):
                 self.facts['virtualization_role'] = 'host'
                 return
 
+        # If none of the above matches, return 'NA' for virtualization_type
+        # and virtualization_role. This allows for proper grouping.
+        self.facts['virtualization_type'] = 'NA'
+        self.facts['virtualization_role'] = 'NA'
+        return
+
+
 class HPUXVirtual(Virtual):
     """
     This is a HP-UX specific subclass of Virtual. It defines