diff --git a/app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/authentication/SecureStoreChangeHandlerImpl.java b/app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/authentication/SecureStoreChangeHandlerImpl.java
index f2177aed32..744f6e72fd 100644
--- a/app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/authentication/SecureStoreChangeHandlerImpl.java
+++ b/app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/authentication/SecureStoreChangeHandlerImpl.java
@@ -42,6 +42,10 @@ public void secureStoreChanged(List<ScopedAuthenticationToken> validTokens) {
         if (appDescriptor != null && appDescriptor instanceof SaveAndRestoreApplication) {
             SaveAndRestoreApplication saveAndRestoreApplication = (SaveAndRestoreApplication) appDescriptor;
             SaveAndRestoreInstance saveAndRestoreInstance = (SaveAndRestoreInstance) saveAndRestoreApplication.getInstance();
+            // Save&restore app may not be launched (yet)
+            if(saveAndRestoreInstance == null){
+                return;
+            }
             saveAndRestoreInstance.secureStoreChanged(validTokens);
         }
     }