diff --git a/src/setting.cc b/src/setting.cc
index 70fcbad7..fc9f1149 100644
--- a/src/setting.cc
+++ b/src/setting.cc
@@ -107,6 +107,7 @@ namespace conky {
 
 		void config_setting_base::lua_set(lua::state &l)
 		{
+			std::lock_guard<lua::state> guard(l);
 			lua::stack_sentry s(l, -1);
 			l.checkstack(2);
 
diff --git a/src/setting.hh b/src/setting.hh
index b7fd4365..e7b20642 100644
--- a/src/setting.hh
+++ b/src/setting.hh
@@ -209,6 +209,7 @@ namespace conky {
 	template<typename T>
 	T config_setting_template<T>::get(lua::state &l)
 	{
+		std::lock_guard<lua::state> guard(l);
 		lua::stack_sentry s(l);
 		l.checkstack(2);