diff --git a/internal/stringvariables/entities.go b/internal/stringvariables/entities.go
index 026514a0..f2979a58 100644
--- a/internal/stringvariables/entities.go
+++ b/internal/stringvariables/entities.go
@@ -30,14 +30,6 @@ func ReplaceEntityVars(prefix string, source string) string {
 	return source
 }
 
-func RemoveKeysThatStartWith(search string) {
-	for k, _ := range contents {
-		if strings.HasPrefix(k, search) {
-			delete(contents, k)
-		}
-	}
-}
-
 func GetEntities(entityTitle string) []string {
 	var ret []string
 
diff --git a/internal/stringvariables/map.go b/internal/stringvariables/map.go
index 79c95ace..57e79e15 100644
--- a/internal/stringvariables/map.go
+++ b/internal/stringvariables/map.go
@@ -12,6 +12,8 @@ package stringvariables
 import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
+	"strings"
+	"sync"
 )
 
 var (
@@ -21,15 +23,25 @@ var (
 		Name: "olivetin_sv_count",
 		Help: "The number entries in the sv map",
 	})
+
+	rwmutex = sync.RWMutex{}
 )
 
 func init() {
+	rwmutex.Lock()
+
 	contents = make(map[string]string)
+
+	rwmutex.Unlock()
 }
 
 func Get(key string) string {
+	rwmutex.RLock()
+
 	v, ok := contents[key]
 
+	rwmutex.RUnlock()
+
 	if !ok {
 		return ""
 	} else {
@@ -42,7 +54,23 @@ func GetAll() map[string]string {
 }
 
 func Set(key string, value string) {
+	rwmutex.Lock()
+
 	contents[key] = value
 
 	metricSvCount.Set(float64(len(contents)))
+
+	rwmutex.Unlock()
+}
+
+func RemoveKeysThatStartWith(search string) {
+	rwmutex.Lock()
+
+	for k, _ := range contents {
+		if strings.HasPrefix(k, search) {
+			delete(contents, k)
+		}
+	}
+
+	rwmutex.Unlock()
 }