killbill-memoizeit

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java
index f826983..1b12c05 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/AccountResource.java
@@ -425,7 +425,7 @@ public class AccountResource extends JaxRsResourceBase {
             final Iterable<Subscription> toBeCancelled = Iterables.filter(subscriptions, new Predicate<Subscription>() {
                 @Override
                 public boolean apply(final Subscription input) {
-                    return input.getLastActiveProductCategory() != ProductCategory.ADD_ON;
+                    return input.getLastActiveProductCategory() != ProductCategory.ADD_ON && input.getBillingEndDate() == null;
                 }
             });
             for (final Subscription cur : toBeCancelled) {