diff --git a/app/Bus/Handlers/Commands/Subscriber/UnsubscribeSubscriberCommandHandler.php b/app/Bus/Handlers/Commands/Subscriber/UnsubscribeSubscriberCommandHandler.php
index 7dac8828..cf43e1be 100644
--- a/app/Bus/Handlers/Commands/Subscriber/UnsubscribeSubscriberCommandHandler.php
+++ b/app/Bus/Handlers/Commands/Subscriber/UnsubscribeSubscriberCommandHandler.php
@@ -15,6 +15,13 @@ use CachetHQ\Cachet\Bus\Commands\Subscriber\UnsubscribeSubscriberCommand;
 use CachetHQ\Cachet\Bus\Events\Subscriber\SubscriberHasUnsubscribedEvent;
 use CachetHQ\Cachet\Models\Subscriber;
 
+/**
+ * This is the unsubscribe subscriber command class.
+ *
+ * @author Joseph Cohem <joe@alt-three.com>
+ * @author Graham Campbell <graham@alt-three.com>
+ * @author James Brooks <james@alt-three.com>
+ */
 class UnsubscribeSubscriberCommandHandler
 {
     /**
@@ -28,8 +35,12 @@ class UnsubscribeSubscriberCommandHandler
     {
         $subscriber = $command->subscriber;
 
+        // First remove subscriptions.
+        $subscriber->subscriptions()->delete();
+
         event(new SubscriberHasUnsubscribedEvent($subscriber));
 
+        // Then remove the subscriber.
         $subscriber->delete();
     }
 }