diff --git a/entity/CampaignAddParticipants_entity/entityfields/addparticipants/stateProcess.js b/entity/CampaignAddParticipants_entity/entityfields/addparticipants/stateProcess.js
index 8271cfcda5c3966074453a2c2c22d86b086388ce..c85f7e47be1516470164487978aaa2ccf7169e10 100644
--- a/entity/CampaignAddParticipants_entity/entityfields/addparticipants/stateProcess.js
+++ b/entity/CampaignAddParticipants_entity/entityfields/addparticipants/stateProcess.js
@@ -3,13 +3,20 @@ import("system.result");
 import("system.vars");
 
 if (vars.get("$sys.validationerrors"))
+{
     result.string(neon.COMPONENTSTATE_DISABLED);
-else
+}
+else if(vars.get("$field.campaignparticipantContactIds") != null && vars.get("$field.campaignparticipantContactIds") != "")
 {
     var contactCount = JSON.parse(vars.get("$field.campaignparticipantContactIds")).length;
+    
     if (contactCount == 0)
+    {
         result.string(neon.COMPONENTSTATE_DISABLED);
+    }
     else
+    {
         result.string(neon.COMPONENTSTATE_EDITABLE);
+    }
 }
     
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValidation.js b/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValidation.js
index c84027b8fee4b1faaeaa73067205a136f7ce68ba..c596003e424ef1b3ec890598ce9a8ecadedc4ec4 100644
--- a/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValidation.js
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaign_id/onValidation.js
@@ -3,17 +3,22 @@ import("system.result");
 import("Sql_lib");
 import("system.translate");
 
-let participants = JSON.parse(vars.get("$param.campaignParticipantsRowIds_param"));
-if(participants.length > 0)
+
+if (vars.get("$param.campaignParticipantsRowIds_param") != null && vars.get("$param.campaignParticipantsRowIds_param") != "")
 {
-    let thisParticipantCount = newSelect("count('')").from("CAMPAIGNPARTICIPANT")
-        .where("CAMPAIGNPARTICIPANT.CAMPAIGN_ID", vars.get("$field.CAMPAIGN_ID"))
-        .and(
-            "CAMPAIGNPARTICIPANT.CONTACT_ID",
-            participants,
-            SqlBuilder.IN()
-        ).cell();
+    let participants = JSON.parse(vars.get("$param.campaignParticipantsRowIds_param"));
+
+    if(participants.length > 0)
+    {
+        let thisParticipantCount = newSelect("COUNT(*)")
+                                        .from("CAMPAIGNPARTICIPANT")
+                                        .where("CAMPAIGNPARTICIPANT.CAMPAIGN_ID", vars.get("$field.CAMPAIGN_ID"))
+                                        .and("CAMPAIGNPARTICIPANT.CONTACT_ID", participants, SqlBuilder.IN())
+                                        .cell();
 
-    if(parseInt(thisParticipantCount) > 0)
-        result.string(translate.text("Participant is already participating"));
+        if(parseInt(thisParticipantCount) > 0)
+        {
+            result.string(translate.text("Participant is already participating"));
+        }
+    }
 }