diff --git a/application/src/main/java/org/thingsboard/server/controller/MobileAppController.java b/application/src/main/java/org/thingsboard/server/controller/MobileAppController.java
index 362539f6b6..0673ce1fdf 100644
--- a/application/src/main/java/org/thingsboard/server/controller/MobileAppController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/MobileAppController.java
@@ -168,7 +168,7 @@ public class MobileAppController extends BaseController {
                     .collect(Collectors.toList());
             return JacksonUtil.toJsonNode(JacksonUtil.writeValueAsViewIgnoringNullFields(mobilePages, Views.Public.class));
         } else {
-            return JacksonUtil.newArrayNode();
+            return null;
         }
     }
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/mobile/MobileAppBundleServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/mobile/MobileAppBundleServiceImpl.java
index 4997ad8d30..e2c817e0c5 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/mobile/MobileAppBundleServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/mobile/MobileAppBundleServiceImpl.java
@@ -71,8 +71,8 @@ public class MobileAppBundleServiceImpl extends AbstractEntityService implements
             return savedMobileApp;
         } catch (Exception e) {
             checkConstraintViolation(e,
-                    Map.of("android_app_id_unq_key", "Android mobile app already exists in another bundle!",
-                            "ios_app_id_unq_key", "IOS mobile app already exists in another bundle!"));
+                    Map.of("mobile_app_bundle_android_app_id_key", "Android mobile app is already configured in another bundle!",
+                            "mobile_app_bundle_ios_app_id_key", "IOS mobile app is already configured in another bundle!"));
             throw e;
         }
     }