diff --git a/swing/src/net/sf/openrocket/file/photo/PhotoStudioGetter.java b/swing/src/net/sf/openrocket/file/photo/PhotoStudioGetter.java
index d47c4aa0c..31bea899d 100644
--- a/swing/src/net/sf/openrocket/file/photo/PhotoStudioGetter.java
+++ b/swing/src/net/sf/openrocket/file/photo/PhotoStudioGetter.java
@@ -187,18 +187,6 @@ public class PhotoStudioGetter {
                     s = Orbit.instance;
                 else if (Storm.class.isAssignableFrom(cl))
                     s = Storm.instance;
-                else {
-                    // Case where sky is a dummy sky, displaying <none>
-                    s = new Sky() {
-                        @Override
-                        public void draw(com.jogamp.opengl.GL2 gl, TextureCache cache) { }
-
-                        @Override
-                        public String toString() {
-                            return Application.getTranslator().get("DecalModel.lbl.select");
-                        }
-                    };
-                }
             }
             catch (ClassNotFoundException e) {
                 log.info("Could not load sky class '" + content + "'.");
diff --git a/swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoSettingsConfig.java b/swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoSettingsConfig.java
index 55658ccb2..758cc47f3 100644
--- a/swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoSettingsConfig.java
+++ b/swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoSettingsConfig.java
@@ -267,7 +267,12 @@ public class PhotoSettingsConfig extends JTabbedPane {
 							}
 						});
 
-						setSelectedItem(p.getSky());
+						if (p.getSky() != null) {
+							setSelectedItem(p.getSky());
+						}
+						else {
+							setSelectedItem(noSky);
+						}
 					}
 				}, "wrap");