diff --git a/_states/novav21.py b/_states/novav21.py
index 0d8d76d..be424b7 100644
--- a/_states/novav21.py
+++ b/_states/novav21.py
@@ -197,7 +197,7 @@
             name, availability_zone_name, cloud_name=cloud_name)
         if metadata:
             _call_nova_salt_module('aggregate_set_metadata', name)(
-                cloud_name=cloud_name, **metadata)
+                name, cloud_name=cloud_name, **metadata)
             aggregate['metadata'] = metadata
         for host in hosts or []:
             _call_nova_salt_module('aggregate_add_host', name)(
@@ -209,7 +209,7 @@
         changes = {}
         existing_meta = set(aggregate['metadata'].items())
         requested_meta = set(metadata.items())
-        if hosts and (existing_meta - requested_meta or requested_meta - existing_meta):
+        if existing_meta - requested_meta or requested_meta - existing_meta:
             _call_nova_salt_module('aggregate_set_metadata', name)(
                 name, cloud_name=cloud_name, **metadata)
             changes['metadata'] = metadata