diff --git a/core/internal/matugen/matugen.go b/core/internal/matugen/matugen.go
index 1256e189..b77c4e4c 100644
--- a/core/internal/matugen/matugen.go
+++ b/core/internal/matugen/matugen.go
@@ -160,14 +160,16 @@ func Run(opts Options) error {
 
 	log.Infof("Building theme: %s %s (%s)", opts.Kind, opts.Value, opts.Mode)
 
-	if err := buildOnce(&opts); err != nil {
-		return err
-	}
+	buildErr := buildOnce(&opts)
 
 	if opts.SyncModeWithPortal {
 		syncColorScheme(opts.Mode)
 	}
 
+	if buildErr != nil {
+		return buildErr
+	}
+
 	log.Info("Done")
 	return nil
 }
diff --git a/quickshell/Common/Theme.qml b/quickshell/Common/Theme.qml
index 654e952b..5ac94085 100644
--- a/quickshell/Common/Theme.qml
+++ b/quickshell/Common/Theme.qml
@@ -961,7 +961,9 @@ Singleton {
         }
 
         if (!isGreeterMode) {
-            PortalService.setLightMode(light);
+            if (!matugenAvailable) {
+                PortalService.setLightMode(light);
+            }
             if (typeof SettingsData !== "undefined") {
                 SettingsData.updateCosmicThemeMode(light);
             }