diff --git a/ipaclient/remote_plugins/__init__.py b/ipaclient/remote_plugins/__init__.py
index 444651d30..976d69687 100644
--- a/ipaclient/remote_plugins/__init__.py
+++ b/ipaclient/remote_plugins/__init__.py
@@ -59,7 +59,8 @@ class ServerInfo(collections.MutableMapping):
         return self._dict[key]
 
     def __setitem__(self, key, value):
-        self._dirty = key not in self._dict or self._dict[key] != value
+        if key not in self._dict or self._dict[key] != value:
+            self._dirty = True
         self._dict[key] = value
 
     def __delitem__(self, key):