diff --git a/src/libstrongswan/plugins/plugin_loader.c b/src/libstrongswan/plugins/plugin_loader.c
index 94ef00b2e2..c1a929bd61 100644
--- a/src/libstrongswan/plugins/plugin_loader.c
+++ b/src/libstrongswan/plugins/plugin_loader.c
@@ -429,6 +429,10 @@ static int load_features(private_plugin_loader_t *this, bool soft, bool report)
 			}
 			feature++;
 		}
+		if (loaded && !report)
+		{	/* got new feature, restart from beginning of list */
+			break;
+		}
 	}
 	enumerator->destroy(enumerator);
 	return loaded;