diff --git a/ccnode/tags.py b/ccnode/tags.py
index e129931bb07d1f95c136ba70ecc1c4ba9f3d6f94..248533f1776c96bbe8708c214ec1d5bf78bddb8d 100644
--- a/ccnode/tags.py
+++ b/ccnode/tags.py
@@ -65,13 +65,10 @@ class Tag(object):
         """Called when the tag value may change."""
         prev_value = self.value
         self.calculate_value()
-        # if tag is not pushed
-        # if self.ttl is not None:
-        if self.ttl != -1:
-            return
+
         if prev_value == self.value:
             return
-        if prev_value is None:
+        elif prev_value is None:
             # we need to register tag again
             if self.sub_id == '__main__':
                 logger.debug('Register tag %s', self.name)
@@ -88,6 +85,10 @@ class Tag(object):
             else:
                 logger.debug('Unregister sub tag %s.%s', self.sub_id, self.name)
                 self.db.rpc_unregister_sub_tag(self.sub_id, self.name)
+        # if tag is not pushed
+        # if self.ttl is not None:
+        elif self.ttl != -1:
+            return
         else:
             # update the tag value
             logger.debug('Update tag value %s', self.name)