diff --git a/lib/base/scriptframe.cpp b/lib/base/scriptframe.cpp
index 374c11d74..7e62906c8 100644
--- a/lib/base/scriptframe.cpp
+++ b/lib/base/scriptframe.cpp
@@ -36,7 +36,9 @@ INITIALIZE_ONCE_WITH_PRIORITY([]() {
 	l_StatsNS = new Namespace(true);
 	globalNS->Set("StatsFunctions", l_StatsNS, true);
 
-	globalNS->Set("Internal", new Namespace(), true);
+	Namespace::Ptr intNS = new Namespace();
+	intNS->Set("modified_attributes", new Dictionary(), true);
+	globalNS->Set("Internal", intNS, true);
 }, InitializePriority::CreateNamespaces);
 
 INITIALIZE_ONCE_WITH_PRIORITY([]() {
diff --git a/lib/cli/daemonutility.cpp b/lib/cli/daemonutility.cpp
index 3116f8ca4..520dfc284 100644
--- a/lib/cli/daemonutility.cpp
+++ b/lib/cli/daemonutility.cpp
@@ -254,7 +254,7 @@ bool DaemonUtility::LoadConfigFiles(const std::vector<std::string>& configs,
 
 	WorkQueue upq(25000, Configuration::Concurrency);
 	upq.SetName("DaemonUtility::LoadConfigFiles");
-	bool result = ConfigItem::CommitItems(ascope.GetContext(), upq, newItems);
+	bool result = ConfigItem::CommitItems(ascope.GetContext(), upq, newItems, false, true);
 
 	if (!result) {
 		ConfigCompilerContext::GetInstance()->CancelObjectsFile();
diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp
index fef463d70..8f9bf0dae 100644
--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@@ -191,6 +191,20 @@ ConfigObject::Ptr ConfigItem::Commit(bool discard)
 		m_Scope->CopyTo(frame.Locals);
 	try {
 		m_Expression->Evaluate(frame, &debugHints);
+
+		Dictionary::Ptr allMods (Namespace::Ptr(ScriptGlobal::Get("Internal"))->Get("modified_attributes"));
+		Dictionary::Ptr typeMods (allMods->Get(type->GetName()));
+
+		if (typeMods) {
+			Function::Ptr objMods (typeMods->Get(m_Name));
+
+			if (objMods) {
+				objMods->Invoke({dobj});
+
+				ObjectLock oLock(typeMods);
+				typeMods->Remove(m_Name);
+			}
+		}
 	} catch (const std::exception& ex) {
 		if (m_IgnoreOnError) {
 			Log(LogNotice, "ConfigObject")
@@ -594,11 +608,28 @@ bool ConfigItem::CommitNewItems(const ActivationContext::Ptr& context, WorkQueue
 	return true;
 }
 
-bool ConfigItem::CommitItems(const ActivationContext::Ptr& context, WorkQueue& upq, std::vector<ConfigItem::Ptr>& newItems, bool silent)
+bool ConfigItem::CommitItems(const ActivationContext::Ptr& context, WorkQueue& upq, std::vector<ConfigItem::Ptr>& newItems,
+	bool silent, bool withModAttrs)
 {
 	if (!silent)
 		Log(LogInformation, "ConfigItem", "Committing config item(s).");
 
+	if (withModAttrs) {
+		/* restore modified attributes */
+		if (Utility::PathExists(Configuration::ModAttrPath)) {
+			std::unique_ptr<Expression> expression = ConfigCompiler::CompileFile(Configuration::ModAttrPath);
+
+			if (expression) {
+				try {
+					ScriptFrame frame(true);
+					expression->Evaluate(frame);
+				} catch (const std::exception& ex) {
+					Log(LogCritical, "config", DiagnosticInformation(ex));
+				}
+			}
+		}
+	}
+
 	if (!CommitNewItems(context, upq, newItems)) {
 		upq.ReportExceptions("config");
 
@@ -646,7 +677,9 @@ bool ConfigItem::ActivateItems(const std::vector<ConfigItem::Ptr>& newItems, boo
 {
 	if (withModAttrs) {
 		/* restore modified attributes */
-		if (Utility::PathExists(Configuration::ModAttrPath)) {
+		if (Utility::PathExists(Configuration::ModAttrPath) &&
+			!Dictionary::Ptr(Namespace::Ptr(ScriptGlobal::Get("Internal"))->Get("modified_attributes"))->GetLength()
+		) {
 			std::unique_ptr<Expression> expression = ConfigCompiler::CompileFile(Configuration::ModAttrPath);
 
 			if (expression) {
diff --git a/lib/config/configitem.hpp b/lib/config/configitem.hpp
index 007a3c08a..f075bc980 100644
--- a/lib/config/configitem.hpp
+++ b/lib/config/configitem.hpp
@@ -52,7 +52,8 @@ public:
 	static ConfigItem::Ptr GetByTypeAndName(const Type::Ptr& type,
 		const String& name);
 
-	static bool CommitItems(const ActivationContext::Ptr& context, WorkQueue& upq, std::vector<ConfigItem::Ptr>& newItems, bool silent = false);
+	static bool CommitItems(const ActivationContext::Ptr& context, WorkQueue& upq, std::vector<ConfigItem::Ptr>& newItems,
+		bool silent = false, bool withModAttrs = false);
 	static bool ActivateItems(const std::vector<ConfigItem::Ptr>& newItems, bool runtimeCreated = false,
 		bool mainConfigActivation = false, bool withModAttrs = false, const Value& cookie = Empty);
 
diff --git a/lib/icinga/icingaapplication.cpp b/lib/icinga/icingaapplication.cpp
index abbc3a566..6e6f63e94 100644
--- a/lib/icinga/icingaapplication.cpp
+++ b/lib/icinga/icingaapplication.cpp
@@ -135,15 +135,11 @@ static void PersistModAttrHelper(AtomicFile& fp, ConfigObject::Ptr& previousObje
 			ConfigWriter::EmitRaw(fp, "\n}\n\n");
 		}
 
-		ConfigWriter::EmitRaw(fp, "var obj = ");
-
-		Array::Ptr args1 = new Array({
-			object->GetReflectionType()->GetName(),
-			object->GetName()
-		});
-		ConfigWriter::EmitFunctionCall(fp, "get_object", args1);
-
-		ConfigWriter::EmitRaw(fp, "\nif (obj) {\n");
+		ConfigWriter::EmitRaw(fp, "Internal.modified_attributes[");
+		ConfigWriter::EmitValue(fp, 0, object->GetReflectionType()->GetName());
+		ConfigWriter::EmitRaw(fp, "][");
+		ConfigWriter::EmitValue(fp, 0, object->GetName());
+		ConfigWriter::EmitRaw(fp, "] = obj => {\n");
 	}
 
 	ConfigWriter::EmitRaw(fp, "\tobj.");