diff --git a/storage/src/main/java/de/citec/jul/storage/registry/Registry.java b/storage/src/main/java/de/citec/jul/storage/registry/Registry.java
index <HASH>..<HASH> 100644
--- a/storage/src/main/java/de/citec/jul/storage/registry/Registry.java
+++ b/storage/src/main/java/de/citec/jul/storage/registry/Registry.java
@@ -159,7 +159,7 @@ public class Registry<KEY, VALUE extends Identifiable<KEY>> extends Observable<M
         synchronized (SYNC) {
             int interationCounter = 0;
             boolean valid = false;
-            while (!valid) {
+            while (!valid && !consistencyHandlerList.isEmpty()) {
                 for (ConsistencyHandler consistencyHandler : consistencyHandlerList) {
                     try {
                         valid &= !consistencyHandler.processData(registry, this);
handle wrong consistency handling in case no handler is registered.