diff --git a/src/DataProvider.js b/src/DataProvider.js
index 00cbf2732..78d264fba 100644
--- a/src/DataProvider.js
+++ b/src/DataProvider.js
@@ -51,9 +51,9 @@ export default {
   baseURL() {
     return localStorage.getItem('baseURL');
   },
-  
+
   // Methods below are used in the components
-  
+
   getTasks(params) {
     const endpoint = _.get(window, 'PM4ConfigOverrides.getTasksEndpoint', '/tasks');
     return this.get(endpoint + params).then(response => {
@@ -83,7 +83,8 @@ export default {
       const cache = this.screensCache.find(screen => screen.id == id);
       if (cache) {
         resolve({data: cache});
-      } else {
+      }
+      if (!cache && id != undefined) {
         const request = this.get(endpoint + `/${id}${query}`);
         request.then(response => {
           if (response.data.nested) {
@@ -94,7 +95,7 @@ export default {
       }
     });
   },
-  
+
   postScript(id, params) {
     let endpoint = _.get(
       window,