diff --git a/data/configurables/converterFocuses.txt b/data/configurables/converterFocuses.txt
index ca7362c66..b0a5425d1 100644
--- a/data/configurables/converterFocuses.txt
+++ b/data/configurables/converterFocuses.txt
@@ -3003,12 +3003,10 @@ focus = {
 		}
 		ai_will_do = {
 			factor = 1
+			#DEMOCRATIC
 			modifier = {
 				factor = 0
-				OR = {
-					has_government = democratic
-					has_government = neutrality
-				}
+				has_government = neutrality
 			}
 			modifier = {
 				factor = 0
@@ -3078,12 +3076,10 @@ focus = {
 		}
 		ai_will_do = {
 			factor = 10
+			#DEMOCRATIC
 			modifier = {
 				factor = 0
-				OR = {
-					has_government = democratic
-					has_government = neutrality
-				}
+				has_government = neutrality
 			}
 			modifier = {
 				factor = 0
diff --git a/src/HOI4World/HoI4FocusTree.cpp b/src/HOI4World/HoI4FocusTree.cpp
index 58983a32c..30e8c04c3 100644
--- a/src/HOI4World/HoI4FocusTree.cpp
+++ b/src/HOI4World/HoI4FocusTree.cpp
@@ -1615,6 +1615,13 @@ std::set<std::string> HoI4FocusTree::addConquerBranch(const HoI4::Country& theCo
 		borderDisputesFocus->xPos = nextFreeColumn;
 		borderDisputesFocus->yPos = 0;
 		borderDisputesFocus->updateFocusElement(borderDisputesFocus->aiWillDo, "$TARGET", strategy.getID());
+		borderDisputesFocus->updateFocusElement(borderDisputesFocus->aiWillDo,
+			 "#DEMOCRATIC",
+			 "modifier = {\n"
+			 "\t\t\t\tfactor = 0\n"
+			 "\t\t\t\thas_government = democratic\n"
+			 "\t\t\t}\n",
+			 majorIdeologies.contains("democratic"));
 		focuses.push_back(borderDisputesFocus);
 
 		auto assertClaimsFocus =
@@ -1647,6 +1654,13 @@ std::set<std::string> HoI4FocusTree::addConquerBranch(const HoI4::Country& theCo
 			 "#ADDCLAIM",
 			 "add_state_claim = " + claimStateId);
 		assertClaimsFocus->updateFocusElement(assertClaimsFocus->aiWillDo, "$TARGET", strategy.getID());
+		assertClaimsFocus->updateFocusElement(assertClaimsFocus->aiWillDo,
+			 "#DEMOCRATIC",
+			 "modifier = {\n"
+			 "\t\t\t\tfactor = 0\n"
+			 "\t\t\t\thas_government = democratic\n"
+			 "\t\t\t}\n",
+			 majorIdeologies.contains("democratic"));
 		focuses.push_back(assertClaimsFocus);
 
 		auto prepareForWarFocus =