diff --git a/packages/cubejs-playground/src/components/CachePane.js b/packages/cubejs-playground/src/components/CachePane.js
index f521a2c3aa645..1ef4d0f05987f 100644
--- a/packages/cubejs-playground/src/components/CachePane.js
+++ b/packages/cubejs-playground/src/components/CachePane.js
@@ -76,6 +76,7 @@ const CachePane = ({ query, cubejsApi }) => (
                   title: 'Refresh Key Value',
                   key: 'value',
                   render: (text, record) => rs && rs.loadResponse.usedPreAggregations
+                    && rs.loadResponse.usedPreAggregations[record.tableName].refreshKeyValues
                     && rs.loadResponse.usedPreAggregations[record.tableName].refreshKeyValues.map(k => (
                       <PrismCode
                         key={JSON.stringify(k)}
diff --git a/packages/cubejs-query-orchestrator/orchestrator/PreAggregations.js b/packages/cubejs-query-orchestrator/orchestrator/PreAggregations.js
index 228251e2efec0..132520fa534ff 100644
--- a/packages/cubejs-query-orchestrator/orchestrator/PreAggregations.js
+++ b/packages/cubejs-query-orchestrator/orchestrator/PreAggregations.js
@@ -182,7 +182,16 @@ class PreAggregationLoader {
     this.structureVersionPersistTime = preAggregations.structureVersionPersistTime;
     this.externalRefresh = options.externalRefresh;
     if (this.externalRefresh && this.waitForRenew) {
-      throw new Error("Invalid configuration - when externalRefresh is true, it will not perform a renew, therefore you cannot wait for it using waitForRenew.");
+      const message = 'Invalid configuration - when externalRefresh is true, it will not perform a renew, therefore you cannot wait for it using waitForRenew.';
+      if (['production', 'test'].includes(process.env.NODE_ENV)) {
+        throw new Error(message);
+      } else {
+        this.logger('Invalid Configuration', {
+          requestId: this.requestId,
+          warning: message,
+        });
+        this.waitForRenew = false;
+      }
     }
   }