diff --git a/internal/server/server.go b/internal/server/server.go
index 0208c50..c193afb 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -62,6 +62,7 @@ type Server struct {
 	staticFiles embed.FS           // Embedded static web assets
 	server      *http.Server       // HTTP server instance
 	origin      OriginConfig       // Geographic reference point
+	debug       bool               // Enable debug output
 
 	// WebSocket management
 	wsClients   map[*websocket.Conn]bool // Active WebSocket client connections
@@ -105,9 +106,10 @@ type AircraftUpdate struct {
 //   - database: Optional database for persistence and callsign enhancement
 //   - staticFiles: Embedded filesystem containing web assets
 //   - origin: Geographic reference point for the map interface
+//   - debug: Enable debug output for troubleshooting
 //
 // Returns a configured but not yet started server instance.
-func NewWebServer(host string, port int, merger *merger.Merger, database *database.Database, staticFiles embed.FS, origin OriginConfig) *Server {
+func NewWebServer(host string, port int, merger *merger.Merger, database *database.Database, staticFiles embed.FS, origin OriginConfig, debug bool) *Server {
 	return &Server{
 		host:        host,
 		port:        port,
@@ -115,6 +117,7 @@ func NewWebServer(host string, port int, merger *merger.Merger, database *databa
 		database:    database,
 		staticFiles: staticFiles,
 		origin:      origin,
+		debug:       debug,
 		wsClients:   make(map[*websocket.Conn]bool),
 		upgrader: websocket.Upgrader{
 			CheckOrigin: func(r *http.Request) bool {
@@ -1068,8 +1071,10 @@ func (s *Server) debugEmbeddedFiles() {
 
 // handleDatabasePage serves the database status page
 func (s *Server) handleDatabasePage(w http.ResponseWriter, r *http.Request) {
-	// Debug embedded files first
-	s.debugEmbeddedFiles()
+	// Debug embedded files if debug is enabled
+	if s.debug {
+		s.debugEmbeddedFiles()
+	}
 
 	// Try to read the database HTML file from embedded assets
 	data, err := s.staticFiles.ReadFile("static/database.html")