diff --git a/lib/pdf/pdf.go b/lib/pdf/pdf.go
index 4ec7eb273..7cfc9b0b1 100644
--- a/lib/pdf/pdf.go
+++ b/lib/pdf/pdf.go
@@ -44,14 +44,14 @@ func (g *GoFPDF) GetFillRGB(themeID int64, fill string) (color.RGB, error) {
 		}, nil
 	}
 
-	rgb := color.Name2RGB(fill)
-	if (rgb != color.RGB{}) {
-		return rgb, nil
-	}
-
 	if color.IsThemeColor(fill) {
 		theme := d2themescatalog.Find(themeID)
 		fill = d2themes.ResolveThemeColor(theme, fill)
+	} else {
+		rgb := color.Name2RGB(fill)
+		if (rgb != color.RGB{}) {
+			return rgb, nil
+		}
 	}
 
 	return color.Hex2RGB(fill)