diff --git a/admin-spa/src/routes/Settings/Tax.tsx b/admin-spa/src/routes/Settings/Tax.tsx
index bf61f66..7ac7a56 100644
--- a/admin-spa/src/routes/Settings/Tax.tsx
+++ b/admin-spa/src/routes/Settings/Tax.tsx
@@ -221,7 +221,10 @@ export default function TaxSettings() {
             action={
               <Button
                 size="sm"
-                onClick={() => setShowAddRate(true)}
+                onClick={() => {
+                  setSelectedTaxClass('');
+                  setShowAddRate(true);
+                }}
               >
                 <Plus className="h-4 w-4 mr-2" />
                 {__('Add Tax Rate')}