diff --git a/packages/auth/src/auth-keycloak.js b/packages/auth/src/auth-keycloak.js
index eac61afcedd23b0f62f28bc5506e47dc92a4895f..9c0d66d5a00d1f1eb6c076fbe0417ccda0d03e69 100644
--- a/packages/auth/src/auth-keycloak.js
+++ b/packages/auth/src/auth-keycloak.js
@@ -51,6 +51,9 @@ export class AuthKeycloak extends AdapterLitElement {
                 case 'lang':
                     i18n.changeLanguage(this.lang);
                 break;
+                case 'entryPointUrl':
+                    // for preloading the instance
+                    JSONLD.getInstance(this.entryPointUrl, this.lang);
                 case 'requestedLoginStatus':
                     console.log("requested-login-status changed", this.requestedLoginStatus);
                     switch(this.requestedLoginStatus) {
@@ -152,7 +155,6 @@ export class AuthKeycloak extends AdapterLitElement {
         }
 
         this.sendSetPropertyEvent('auth', auth);
-        JSONLD.doInitializationOnce(this.entryPointUrl);
     }
 
     _setLoginStatus(status, force) {
diff --git a/packages/check-in-place-select/src/check-in-place-select.js b/packages/check-in-place-select/src/check-in-place-select.js
index 617ce6be8c3e26dc22b392571c44c2e8595ab44b..f9c721d4596f327bbc6689564e70d163f4daf421 100644
--- a/packages/check-in-place-select/src/check-in-place-select.js
+++ b/packages/check-in-place-select/src/check-in-place-select.js
@@ -309,9 +309,6 @@ export class CheckInPlaceSelect extends ScopedElementsMixin(AdapterLitElement) {
                     // we don't need to preset the selector if the entry point url changes
                     this.initJSONLD(true);
                     break;
-                case "auth":
-                    JSONLD.doInitializationOnce(this.entryPointUrl);
-                    break;
             }
         });
 
diff --git a/packages/common/jsonld.js b/packages/common/jsonld.js
index 956cbae2b40b70b6b67cce7a8225b3f0d183b69d..2b0cb4ddc19102fe656b756db31060ec94307261 100644
--- a/packages/common/jsonld.js
+++ b/packages/common/jsonld.js
@@ -19,7 +19,6 @@ export default class JSONLD {
     static async getInstance(apiUrl, lang = 'de') {
         let promise = JSONLD.promises[apiUrl];
         if (promise === undefined) {
-            JSONLD.doInitializationOnce(apiUrl);
             promise = new Promise((resolve, reject) => {
                 JSONLD.initialize(
                     apiUrl,
@@ -52,24 +51,17 @@ export default class JSONLD {
         // add success and failure functions
         if (typeof successFnc == 'function') JSONLD.successFunctions[apiUrl].push(successFnc);
         if (typeof failureFnc == 'function') JSONLD.failureFunctions[apiUrl].push(failureFnc);
-    }
-
-    /**
-     * This should be run as soon as possible (can be run multiple times)
-     *
-     * @param apiUrl
-     */
-    static doInitializationOnce(apiUrl) {
-        // console.log("doInitializationOnce", apiUrl);
 
-        // check if api call was already started
         if (!apiUrl || JSONLD.initStarted[apiUrl] !== undefined) {
             return;
         }
 
         JSONLD.initStarted[apiUrl] = true;
         JSONLD._doInitialization(apiUrl);
-        // console.log("doInitializationOnce Done", apiUrl);
+    }
+
+    static doInitializationOnce(apiUrl) {
+        // No longer needed, remove any calls
     }
 
     static _doInitialization(apiUrl) {
diff --git a/packages/organization-select/src/organization-select.js b/packages/organization-select/src/organization-select.js
index 954c6ae7399efd35b49bbe329cc57f2d40cfc571..2c9967c282c22ac540e1f6c5ad9ee58408a5aa95 100644
--- a/packages/organization-select/src/organization-select.js
+++ b/packages/organization-select/src/organization-select.js
@@ -199,7 +199,6 @@ export class OrganizationSelect extends AdapterLitElement {
                     }, {}, this.lang);
                     break;
                 case "auth":
-                    JSONLD.doInitializationOnce(this.entryPointUrl);
                     this.initAuthPersonOnce().then();
                     break;
                 default:
diff --git a/packages/person-profile/src/person-profile.js b/packages/person-profile/src/person-profile.js
index 919a9cdf81d4734210b1aea06bdc3511df2252ac..8a3fe9c3e1889dd412b687580a4eeea1bd2d7f79 100644
--- a/packages/person-profile/src/person-profile.js
+++ b/packages/person-profile/src/person-profile.js
@@ -67,9 +67,6 @@ export class PersonProfile extends DBPLitElement {
                             });
                     }
                     break;
-                case "auth":
-                    JSONLD.doInitializationOnce(this.entryPointUrl);
-                    break;
                 default:
             }
         });
diff --git a/packages/person-select/src/person-select.js b/packages/person-select/src/person-select.js
index 1575c5afb2987e18ff58665832eb3359a44a32a4..9c309be81e7c6cbb2800cf75fe3a6f0ff74bbde4 100644
--- a/packages/person-select/src/person-select.js
+++ b/packages/person-select/src/person-select.js
@@ -291,7 +291,6 @@ export class PersonSelect extends ScopedElementsMixin(AdapterLitElement) {
                     this.initJSONLD(true);
                     break;
                 case "auth":
-                    JSONLD.doInitializationOnce(this.entryPointUrl);
                     this.active = this.authenticated();
                     break;
             }