diff --git a/Log/DeviceDatabase/ReadMessageNames.go b/Log/DeviceDatabase/ReadMessageNames.go
index 1b12b32..ecd93af 100644
--- a/Log/DeviceDatabase/ReadMessageNames.go
+++ b/Log/DeviceDatabase/ReadMessageNames.go
@@ -20,8 +20,10 @@ func cacheRefreshMessageNames() {
 	Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameSTARTUP, `The message names' refresh thread is now running.`)
 	go func() {
 		for true {
+
+			data := readMessageNamesFromDB()
 			mutexCacheMessageNames.Lock()
-			cacheMessageNames = readMessageNamesFromDB()
+			cacheMessageNames = data
 			mutexCacheMessageNames.Unlock()
 
 			Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelTALKATIVE, LM.MessageNameEXECUTE, `The message names' cache was refreshed.`)
diff --git a/Log/DeviceDatabase/ReadSenderNames.go b/Log/DeviceDatabase/ReadSenderNames.go
index 865abf1..a1e411e 100644
--- a/Log/DeviceDatabase/ReadSenderNames.go
+++ b/Log/DeviceDatabase/ReadSenderNames.go
@@ -20,8 +20,10 @@ func cacheRefreshSenderNames() {
 	Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelINFO, LM.MessageNameSTARTUP, `The sender names' refresh thread is now running.`)
 	go func() {
 		for true {
+
+			data := readSenderNamesFromDB()
 			mutexCacheSenderNames.Lock()
-			cacheSenderNames = readSenderNamesFromDB()
+			cacheSenderNames = data
 			mutexCacheSenderNames.Unlock()
 
 			Log.LogShort(senderName, LM.CategorySYSTEM, LM.LevelTALKATIVE, LM.MessageNameEXECUTE, `The sender names' cache was refreshed.`)