diff --git a/app/src/app/Mapping/Mapping.tsx b/app/src/app/Mapping/Mapping.tsx
index 8a6894c..05cdab0 100644
--- a/app/src/app/Mapping/Mapping.tsx
+++ b/app/src/app/Mapping/Mapping.tsx
@@ -62,7 +62,7 @@ const Mapping: React.FunctionComponent = () => {
         .then((data) => {
           setApiData(data)
           setMappingViewSelectValueOld(mappingViewSelectValue)
-          if (data.default_view != '') {
+          if (data.default_view != '' && data.default_view != 'null' && data.default_view != undefined) {
             setMappingViewSelectValue(data.default_view)
           } else {
             setMappingViewSelectValue(Constants.DEFAULT_VIEW)
diff --git a/pyproject.toml b/pyproject.toml
index bf367de..a691331 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "BASIL"
-version = "1.2.4"
+version = "1.2.5"
 description = "open source software quality management tool"
 authors = [
     {name = "Luigi Pellecchia", email = "lpellecc@redhat.com"},