diff --git a/public/app/AppWrapper.tsx b/public/app/AppWrapper.tsx
index e3a8e59b257..74a71d9711b 100644
--- a/public/app/AppWrapper.tsx
+++ b/public/app/AppWrapper.tsx
@@ -60,7 +60,7 @@ export class AppWrapper extends Component<AppWrapperProps, AppWrapperState> {
     $('.preloader').remove();
 
     // clear any old icon caches
-    const cacheKeys = await window.caches.keys();
+    const cacheKeys = (await window.caches?.keys()) ?? [];
     for (const key of cacheKeys) {
       if (key.startsWith('grafana-icon-cache') && key !== this.iconCacheID) {
         window.caches.delete(key);