diff --git a/src/libs/convert/attendedModality.js b/src/libs/convert/attendedModality.js
index fd6162a5d5e690fd865c1614af0cb29ab40b5211..9168afc5bcdf05479fb35cbf2239abd234920c0c 100644
--- a/src/libs/convert/attendedModality.js
+++ b/src/libs/convert/attendedModality.js
@@ -38,8 +38,6 @@ module.exports = function attendedModality(id) {
         return 'Educação profissional - técnica integrada';
         case 9:
         return 'Educação profissional - técnica concomitante e subsequente';
-        case 10:
-        return 'Ensino Médio Regular e Profissional articulado';
         case 11:
         return 'EJA - Ensino Médio';
         case 12:
diff --git a/src/libs/convert/capitalCode.js b/src/libs/convert/capitalCode.js
index fe7c0862591b81561c96d326d5f824467d9ffaba..658ce5541772f7c79290175d3ff8aa4d93454ca7 100644
--- a/src/libs/convert/capitalCode.js
+++ b/src/libs/convert/capitalCode.js
@@ -74,6 +74,7 @@ module.exports = function capitalCode(id) {
         return 'Goiânia';
         case 53:
         return 'Brasília';
+		case null:
         case 99:
         return 'Não é capital';
         default:
diff --git a/src/libs/convert/metroCode.js b/src/libs/convert/metroCode.js
index 0442f2c757a31b81828e28574b55bb50783c873b..36bf507089c1e7c18dd6d9c82e555f02d9685023 100644
--- a/src/libs/convert/metroCode.js
+++ b/src/libs/convert/metroCode.js
@@ -62,6 +62,7 @@ module.exports = function metroCode(id) {
         return 'Região Metropolitana de Vale do Rio Cuiabá';
         case 52:
         return 'Região Metropolitana de Goiânia';
+		case null:
         case 99:
         return 'Não é região metropolitana ou região administrativa integrada';
         default:
diff --git a/src/libs/routes_v1/newPnad.js b/src/libs/routes_v1/newPnad.js
index bab8cdf981e2411b839f1da33a2f24ca5f17a72c..5bfb7b8a23e5badace6614815f84ba4ae40515b3 100644
--- a/src/libs/routes_v1/newPnad.js
+++ b/src/libs/routes_v1/newPnad.js
@@ -143,6 +143,8 @@ PnadNovoApp.get('/attended_modality', (req, res, next) => {
             id: i, name: id2str.attendedModality(i)
         });
     }
+    // Remove the option with id equals 10 => This option exists in the database, a better solution to this would be remove the option from the database
+    req.result.splice(req.result.findIndex((item) => item.id === 10), 1);
     req.result.push({id: 99, name: id2str.attendedModality(99)});
     next();
 }, response('attended_modality'));