diff --git a/modules/services/vegbilder.js b/modules/services/vegbilder.js
index 332f9ca8e..d1da2d7f0 100644
--- a/modules/services/vegbilder.js
+++ b/modules/services/vegbilder.js
@@ -487,8 +487,8 @@ export default {
     _currentFrame = d.is_sphere? _pannellumFrame : _planeFrame;
 
     _currentFrame
-      .selectPhoto(d, keepOrientation)
-      .showPhotoFrame(wrap);
+      .showPhotoFrame(wrap)
+      .selectPhoto(d, keepOrientation);
 
     return this;
   },
diff --git a/modules/svg/vegbilder.js b/modules/svg/vegbilder.js
index cada3c9e8..37e9c8a05 100644
--- a/modules/svg/vegbilder.js
+++ b/modules/svg/vegbilder.js
@@ -135,6 +135,7 @@ export function svgVegbilder(projection, context, dispatch) {
     if (!service) return;
 
     const frame = service.photoFrame();
+    if (!frame) return;
 
     // update viewfield rotation
     _viewerYaw = frame.getYaw();