diff --git a/reactive/vault_kv.py b/reactive/vault_kv.py
index f8d543e..4396bf6 100644
--- a/reactive/vault_kv.py
+++ b/reactive/vault_kv.py
@@ -1,11 +1,17 @@
 from charmhelpers.core import hookenv, host
 from charms.reactive import when_all, when_not, set_flag, clear_flag
-from charms.reactive import endpoint_from_flag
+from charms.reactive import endpoint_from_flag, register_trigger
 from charms.reactive import data_changed
 
 from charms.layer import vault_kv
 
 
+register_trigger(when_not='vault-kv.connected',
+                 clear_flag='layer.vault-kv.ready')
+register_trigger(when_not='vault-kv.connected',
+                 clear_flag='layer.vault-kv.requested')
+
+
 @when_all('vault-kv.connected')
 @when_not('layer.vault-kv.requested')
 def request_vault_access():
@@ -37,12 +43,6 @@ def check_config_changed():
             set_flag('layer.vault-kv.config.changed')
 
 
-@when_not('vault-kv.connected')
-def clear_ready():
-    clear_flag('layer.vault-kv.ready')
-    clear_flag('layer.vault-kv.requested')
-
-
 def manage_app_kv_flags():
     try:
         app_kv = vault_kv.VaultAppKV()