diff --git a/app.go b/app.go
index 3737706..c7f01d1 100644
--- a/app.go
+++ b/app.go
@@ -413,6 +413,12 @@ func Serve() {
 	connectToDatabase(app)
 	defer shutdown(app)
 
+	// Test database connection
+	err = db.Ping()
+	if err != nil {
+		log.Error("Database ping failed: %s", err)
+	}
+
 	r := mux.NewRouter()
 	handler := NewHandler(app)
 	handler.SetErrorPages(&ErrorPages{