diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index aa04d597d94b0f157827c311eec56767ea450e91..25172bea1c5aac18b228b0b11df4f795e71ab54f 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -314,7 +314,11 @@ public class SnarkManager implements Snark.CompleteListener {
                     themeExists = true;
             }
             if (!themeExists) {
-                theme = DEFAULT_THEME;
+                // Since the default is not "light", explicitly check if universal theme is "classic"
+                if (theme.equals("classic")
+                    theme = "light";
+                else
+                    theme = DEFAULT_THEME;
                 _config.setProperty(PROP_THEME, DEFAULT_THEME);
             }
         }