diff --git a/modules/services/pannellum_photo.js b/modules/services/pannellum_photo.js
index 99222d4d2..262ee660b 100644
--- a/modules/services/pannellum_photo.js
+++ b/modules/services/pannellum_photo.js
@@ -147,6 +147,8 @@ export default {
       _pannellumViewer.removeScene(old_key);
     }
 
+    _pannellumViewer.resize();
+
     return this;
   },
 
diff --git a/modules/svg/panoramax_images.js b/modules/svg/panoramax_images.js
index 7ef876210..17f8ac158 100644
--- a/modules/svg/panoramax_images.js
+++ b/modules/svg/panoramax_images.js
@@ -295,6 +295,7 @@ export function svgPanoramaxImages(projection, context, dispatch) {
         if (!service) return;
 
         const frame = service.photoFrame();
+        if (!frame) return;
 
         // update viewfield rotation
         _viewerYaw = frame.getYaw();