diff --git a/services/static-webserver/client/source/class/osparc/desktop/StudyEditor.js b/services/static-webserver/client/source/class/osparc/desktop/StudyEditor.js
index 5c05cf0d38b..65f28d23962 100644
--- a/services/static-webserver/client/source/class/osparc/desktop/StudyEditor.js
+++ b/services/static-webserver/client/source/class/osparc/desktop/StudyEditor.js
@@ -536,8 +536,8 @@ qx.Class.define("osparc.desktop.StudyEditor", {
     },
 
     __editSlides: function() {
-      if (this.getStudy().getUi().getMode() !== "workbench") {
-        // if the user is not in "workbench" mode, return
+      if (["app", "guided"].includes(this.getStudy().getUi().getMode())) {
+        // if the user is in "app" mode, return
         return;
       }
 
diff --git a/services/static-webserver/client/source/class/osparc/store/Services.js b/services/static-webserver/client/source/class/osparc/store/Services.js
index 7d4903235bf..81fe19909bd 100644
--- a/services/static-webserver/client/source/class/osparc/store/Services.js
+++ b/services/static-webserver/client/source/class/osparc/store/Services.js
@@ -389,12 +389,14 @@ qx.Class.define("osparc.store.Services", {
       // if the one in the cache is the complete one, do not overwrite it
       if (
         this.__isInCache(key, version) &&
+        this.__servicesCached[key][version] &&
         "history" in this.__servicesCached[key][version] // the most complete service metadata is already in cache
       ) {
         return;
       }
       if (
         this.__isInCache(key, version) &&
+        this.__servicesCached[key][version] &&
         "inputs" in this.__servicesCached[key][version] && // this is the second most complete service metadata (/latest)
         value && !("inputs" in value) // the one to be added is not more complete
       ) {