diff --git a/lib/base/configobject.cpp b/lib/base/configobject.cpp
index 1cb6e3f3c..560e8a58a 100644
--- a/lib/base/configobject.cpp
+++ b/lib/base/configobject.cpp
@@ -386,18 +386,18 @@ void ConfigObject::Activate(bool runtimeCreated)
 {
 	CONTEXT("Activating object '" + GetName() + "' of type '" + GetType()->GetName() + "'");
 
-	Start(runtimeCreated);
-
-	ASSERT(GetStartCalled());
-
 	{
 		ObjectLock olock(this);
+
+		Start(runtimeCreated);
+
+		ASSERT(GetStartCalled());
 		ASSERT(!IsActive());
 		SetActive(true, true);
-	}
 
-	if (GetHAMode() == HARunEverywhere)
-		SetAuthority(true);
+		if (GetHAMode() == HARunEverywhere)
+			SetAuthority(true);
+	}
 
 	NotifyActive();
 }
@@ -422,12 +422,12 @@ void ConfigObject::Deactivate(bool runtimeRemoved)
 			return;
 
 		SetActive(false, true);
+
+		SetAuthority(false);
+
+		Stop(runtimeRemoved);
 	}
 
-	SetAuthority(false);
-
-	Stop(runtimeRemoved);
-
 	ASSERT(GetStopCalled());
 
 	NotifyActive();
@@ -465,6 +465,8 @@ void ConfigObject::Resume(void)
 
 void ConfigObject::SetAuthority(bool authority)
 {
+	ObjectLock olock(this);
+
 	if (authority && GetPaused()) {
 		SetResumeCalled(false);
 		Resume();