diff --git a/meta/classes-recipe/multiarch.bbclass b/meta/classes-recipe/multiarch.bbclass
index a30d530c..8b050500 100644
--- a/meta/classes-recipe/multiarch.bbclass
+++ b/meta/classes-recipe/multiarch.bbclass
@@ -88,9 +88,10 @@ python multiarch_virtclass_handler() {
                 if v.endswith('-compat') or v.endswith('-native'):
                     multiarch_var.append(v)
                 # dispatch -archall (arch=all) to native variant
-                if v.endswith('-archall'):
+                elif v.endswith('-archall'):
                     if suffix == '-native':
                         multiarch_var.append(v[:-len('-archall')])
+                # avoid appending the suffix if it is already present
                 else:
                     multiarch_var.append(v + suffix)
             d.setVar(var, ' '.join(multiarch_var))