diff --git a/db.go b/db.go
index e78f4a9..1911fe3 100644
--- a/db.go
+++ b/db.go
@@ -572,7 +572,12 @@ func (db *DBWrapper) QueryFits(params QueryParams) (*FitStatistics, error) {
 
 	flog.Debug("Calculating module statistics for %d killmails", len(killmailIDs))
 
-	if err := db.calculateModuleStats(params, shipTypeIDs, killmailIDs, stats, totalKillmails, flog); err != nil {
+	useKillmailIDs := len(params.Modules) > 0 || len(params.Groups) > 0 || len(params.Systems) > 0
+	var moduleKillmailIDs []int64
+	if useKillmailIDs {
+		moduleKillmailIDs = killmailIDs
+	}
+	if err := db.calculateModuleStats(params, shipTypeIDs, moduleKillmailIDs, stats, totalKillmails, flog); err != nil {
 		flog.Error("Failed to calculate module stats: %v", err)
 		return nil, err
 	}