diff --git a/html_template/pkg.go b/html_template/pkg.go
index 9abfc12..a478789 100644
--- a/html_template/pkg.go
+++ b/html_template/pkg.go
@@ -11,6 +11,7 @@ import (
 	"net/http"
 	"os"
 	"regexp"
+	"sync"
 )
 
 type Engine struct {
@@ -22,6 +23,10 @@ type Engine struct {
 	DevMode            bool
 }
 
+var (
+	templateLock sync.Mutex
+)
+
 func NewEngine(viewFS, staticFS fs.FS, devmode bool) (e Engine, err error) { // {{{
 	e.parsedTemplates = make(map[string]*template.Template)
 	e.viewFS = viewFS
@@ -62,7 +67,9 @@ func (e *Engine) getComponentFilenames() (files []string, err error) { // {{{
 } // }}}
 
 func (e *Engine) ReloadTemplates() { // {{{
+	templateLock.Lock()
 	e.parsedTemplates = make(map[string]*template.Template)
+	templateLock.Unlock()
 } // }}}
 
 func (e *Engine) StaticResource(w http.ResponseWriter, r *http.Request) { // {{{
@@ -119,7 +126,9 @@ func (e *Engine) getPage(layout, page string) (tmpl *template.Template, err erro
 		return
 	}
 
+	templateLock.Lock()
 	e.parsedTemplates[page] = tmpl
+	templateLock.Unlock()
 	return
 } // }}}
 func (e *Engine) Render(p Page, w http.ResponseWriter, r *http.Request) (err error) { // {{{