diff --git a/bubble-server/src/main/java/bubble/service/bill/BillingService.java b/bubble-server/src/main/java/bubble/service/bill/BillingService.java
index 06841306..32a96d9c 100644
--- a/bubble-server/src/main/java/bubble/service/bill/BillingService.java
+++ b/bubble-server/src/main/java/bubble/service/bill/BillingService.java
@@ -92,6 +92,7 @@ public class BillingService extends SimpleDaemon {
                 final long unpaidStart = plan.getPeriod().periodMillis(bill.getPeriodStart());
                 final int unpaidDays = Days.daysBetween(new DateTime(unpaidStart), new DateTime(now())).getDays();
                 if (unpaidDays > MAX_UNPAID_DAYS_BEFORE_STOP) {
+                    accountPlanDAO.update(accountPlan.setEnabled(false));
                     final BubbleNetwork network = networkDAO.findByUuid(accountPlan.getNetwork());
                     try {
                         networkService.stopNetwork(network);
diff --git a/bubble-server/src/test/resources/models/tests/payment/recurring_billing.json b/bubble-server/src/test/resources/models/tests/payment/recurring_billing.json
index ce8e7365..04b32554 100644
--- a/bubble-server/src/test/resources/models/tests/payment/recurring_billing.json
+++ b/bubble-server/src/test/resources/models/tests/payment/recurring_billing.json
@@ -431,7 +431,7 @@
     "comment": "verify plan is no longer enabled",
     "request": { "uri": "me/plans/{{accountPlan.uuid}}" },
     "response": {
-      "check": [ {"condition": "json.getStatus().disabled()"} ]
+      "check": [ {"condition": "json.disabled()"} ]
     }
   },
 
@@ -490,7 +490,7 @@
     "comment": "verify plan has been re-enabled",
     "request": { "uri": "me/plans/{{accountPlan.uuid}}" },
     "response": {
-      "check": [ {"condition": "json.getStatus().enabled()"} ]
+      "check": [ {"condition": "json.enabled()"} ]
     }
   },