diff --git a/package-lock.json b/package-lock.json
index cdf4464..c5dea7d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6257,9 +6257,9 @@
       "dev": true
     },
     "avni-health-modules": {
-      "version": "0.0.25",
-      "resolved": "https://registry.npmjs.org/avni-health-modules/-/avni-health-modules-0.0.25.tgz",
-      "integrity": "sha512-jrtj+7DoT26RRCkobdseYUpVzzIEN6d1iDM7kYXIF4e/8n/GbjfjjtjFRUJnQxCt0+s7zjKj7LjI85o22i4GnQ=="
+      "version": "0.0.26",
+      "resolved": "https://registry.npmjs.org/avni-health-modules/-/avni-health-modules-0.0.26.tgz",
+      "integrity": "sha512-M7D/XrouylzeZUbC6E4hwZF7eXs4RVWoEG5l5vqm7p5K0mmF1PbXjCk7uebUVJJXArMAE5PXFbEtjbzUTKMZoQ=="
     },
     "aws-amplify": {
       "version": "4.3.14",
@@ -11617,9 +11617,9 @@
       }
     },
     "openchs-models": {
-      "version": "1.31.74",
-      "resolved": "https://registry.npmjs.org/openchs-models/-/openchs-models-1.31.74.tgz",
-      "integrity": "sha512-NdIBF0o69SNytOMYu0HS9PHbeHFmcDr2Zpa6+h24RrQeJLDxMN6fz8yQRyHDWqzuIisS0XQXieb3nQW9WnWjaQ==",
+      "version": "1.31.76",
+      "resolved": "https://registry.npmjs.org/openchs-models/-/openchs-models-1.31.76.tgz",
+      "integrity": "sha512-URaXmaUwxukzqjBpO9A5rmJEp++oDwzJ8UgjvOr4f8OdxECVLKrO6NkapAMvnIG55NwBCrgjdwNuwk5K/ji2iA==",
       "requires": {
         "uuid": "^9.0.1"
       },
diff --git a/package.json b/package.json
index 23d70bd..e238677 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "safe-eval": "^0.4.1",
     "uuid": "^7.0.2",
     "avni-health-modules": "0.0.26",
-    "openchs-models": "1.31.48",
+    "openchs-models": "1.31.76",
     "rules-config": "https://github.com/avniproject/rules-config.git#fe552da405368bfd138e2f38e605c1d307e3ebe4",
     "lodash": "^4.17.11",
     "moment": "^2.22.2"
diff --git a/src/services/AuthService.js b/src/services/AuthService.js
index 0831545..125c779 100644
--- a/src/services/AuthService.js
+++ b/src/services/AuthService.js
@@ -12,7 +12,7 @@ export const setUploadUser = async () => {
         console.debug("Fetched details ", details);
         cognitoDetails.setDetails(details);
     }
-    if (!cognitoDetails.isDummy()) {
+    if (!(cognitoDetails.isDummy() || cognitoDetails.isEmpty())) {
         console.debug("Setting up upload user");
         await setupUploadUser();
     }
@@ -37,7 +37,7 @@ const signIn = async function () {
 };
 
 export const getUploadUserToken = async () => {
-    if (cognitoDetails.isDummy()) return null;
+    if (cognitoDetails.isDummy() || cognitoDetails.isEmpty()) return null;
     console.debug("Getting upload user token");
     const currentSession = await Auth.currentSession();
     const jwtToken = currentSession.idToken.jwtToken;
diff --git a/src/services/api.js b/src/services/api.js
index f5d4a42..fdb5857 100644
--- a/src/services/api.js
+++ b/src/services/api.js
@@ -6,11 +6,11 @@ const BASE_URL = "http://localhost:8021";
 export default {
     getLegacyRulesBundle: (token) =>
         axios
-            .get(BASE_URL + "/ruleDependency/search/lastModified?lastModifiedDateTime=1900-01-01T00:00:00.000Z&size=1000", putTokenHeader(token))
+            .get(BASE_URL + "/ruleDependency/search/lastModified?lastModifiedDateTime=1900-01-01T00:00:00.000Z&size=1000", token && putTokenHeader(token))
             .then(response => get(response, "data._embedded.ruleDependency[0].code")),
     getLegacyRules: (token) =>
         axios
-            .get(BASE_URL + "/rule/search/lastModified?lastModifiedDateTime=1900-01-01T00:00:00.000Z&size=1000", putTokenHeader(token))
+            .get(BASE_URL + "/rule/search/lastModified?lastModifiedDateTime=1900-01-01T00:00:00.000Z&size=1000", token && putTokenHeader(token))
             .then(response => get(response, "data._embedded.rule")),
     getSubjects: (addressLevelUUID, subjectTypeName) =>
         axios