diff --git a/changes/issue-12986-fix-no-teams-error b/changes/issue-12986-fix-no-teams-error
new file mode 100644
index 0000000000..46b788a933
--- /dev/null
+++ b/changes/issue-12986-fix-no-teams-error
@@ -0,0 +1 @@
+- fix bug where os_version enpoint returned 404 for `no teams` on controls page
diff --git a/server/service/hosts.go b/server/service/hosts.go
index 47643f8335..93d30e0da8 100644
--- a/server/service/hosts.go
+++ b/server/service/hosts.go
@@ -1496,7 +1496,7 @@ func (svc *Service) OSVersions(ctx context.Context, teamID *uint, platform *stri
 	osVersions, err := svc.ds.OSVersions(ctx, teamID, platform, name, version)
 	if err != nil && fleet.IsNotFound(err) {
 		// differentiate case where team was added after UpdateOSVersions last ran
-		if teamID != nil {
+		if teamID != nil && *teamID > 0 {
 			// most of the time, team should exist so checking here saves unnecessary db calls
 			_, err := svc.ds.Team(ctx, *teamID)
 			if err != nil {