diff --git a/srsue/src/stack/upper/nas.cc b/srsue/src/stack/upper/nas.cc
index 80c490edf..91a4e16d0 100644
--- a/srsue/src/stack/upper/nas.cc
+++ b/srsue/src/stack/upper/nas.cc
@@ -230,7 +230,7 @@ void nas::init(usim_interface_nas* usim_, rrc_interface_nas* rrc_, gw_interface_
     nas_log->error("Empty EIA list. Select at least one EIA algorithm.\n");
   }
   for (std::vector<uint8_t>::const_iterator it = cap_list.begin(); it != cap_list.end(); ++it) {
-    if (*it != 0 && *it < 3) {
+    if (*it != 0 && *it < 4) {
       eia_caps[*it] = true;
     } else {
       nas_log->error("EIA%d is not a valid EIA algorithm.\n", *it);
@@ -243,7 +243,7 @@ void nas::init(usim_interface_nas* usim_, rrc_interface_nas* rrc_, gw_interface_
     nas_log->error("Empty EEA list. Select at least one EEA algorithm.\n");
   }
   for (std::vector<uint8_t>::const_iterator it = cap_list.begin(); it != cap_list.end(); ++it) {
-    if (*it < 3) {
+    if (*it < 4) {
       eea_caps[*it] = true;
     } else {
       nas_log->error("EEA%d is not a valid EEA algorithm.\n", *it);
diff --git a/srsue/test/upper/nas_test.cc b/srsue/test/upper/nas_test.cc
index 0819db8df..046e7314f 100644
--- a/srsue/test/upper/nas_test.cc
+++ b/srsue/test/upper/nas_test.cc
@@ -228,8 +228,8 @@ int security_command_test()
   {
     srsue::nas nas(&nas_log);
     nas_args_t cfg;
-    cfg.eia = "1,2";
-    cfg.eea = "0,1,2";
+    cfg.eia = "1,2,3";
+    cfg.eea = "0,1,2,3";
     nas.init(&usim, &rrc_dummy, &gw, cfg);
     rrc_dummy.init(&nas);