diff --git a/src/main/java/net/gepafin/tendermanagement/dao/FaqDao.java b/src/main/java/net/gepafin/tendermanagement/dao/FaqDao.java
index 482191e3..b8ebd278 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/FaqDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/FaqDao.java
@@ -6,6 +6,7 @@ import net.gepafin.tendermanagement.entities.CallEntity;
 import net.gepafin.tendermanagement.entities.FaqEntity;
 import net.gepafin.tendermanagement.entities.LookUpDataEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
+import net.gepafin.tendermanagement.enums.RoleStatusEnum;
 import net.gepafin.tendermanagement.entities.LookUpDataEntity.LookUpDataTypeEnum;
 import net.gepafin.tendermanagement.model.request.FaqReq;
 import net.gepafin.tendermanagement.model.response.FaqResponseBean;
@@ -81,7 +82,9 @@ public class FaqDao {
 					.orElseThrow(() -> new ResourceNotFoundException(Status.NOT_FOUND,
 							Translator.toLocale(GepafinConstant.FAQ_NOT_FOUND)));
 		} else {
-			lookUpDataService.getOrCreateLookUpDataEntity(faqReq, type);
+			if (Boolean.FALSE.equals(userEntity.getRoleEntity().getRoleType().equals(RoleStatusEnum.ROLE_BENEFICIARY.getValue()))) {
+				lookUpDataService.getOrCreateLookUpDataEntity(faqReq, type);
+			}
 			faqEntity = new FaqEntity();
 			faqEntity.setCall(callEntity);
 			faqEntity.setUser(userEntity);
diff --git a/src/main/java/net/gepafin/tendermanagement/enums/RoleStatusEnum.java b/src/main/java/net/gepafin/tendermanagement/enums/RoleStatusEnum.java
new file mode 100644
index 00000000..3659856d
--- /dev/null
+++ b/src/main/java/net/gepafin/tendermanagement/enums/RoleStatusEnum.java
@@ -0,0 +1,22 @@
+package net.gepafin.tendermanagement.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum RoleStatusEnum {
+
+	ROLE_BENEFICIARY("ROLE_BENEFICIARY"),
+	ROLE_SUPER_ADMIN("ROLE_SUPER_ADMIN"),
+	ROLE_PRE_INSTRUCTOR("ROLE_PRE_INSTRUCTOR"),
+	ROLE_GEPAFIN_OPERATOR("ROLE_GEPAFIN_OPERATOR");
+
+    private String value;
+
+    RoleStatusEnum(String value) {
+        this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+        return value;
+    }
+}