diff --git a/src/events/PaymentStatusChangeHandler.php b/src/events/PaymentStatusChangeHandler.php
index af38f0e..ad29831 100644
--- a/src/events/PaymentStatusChangeHandler.php
+++ b/src/events/PaymentStatusChangeHandler.php
@@ -5,7 +5,6 @@
 use Crm\PaymentsModule\Repository\PaymentsRepository;
 use Crm\SubscriptionsModule\Events\SubscriptionStartsEvent;
 use Crm\SubscriptionsModule\Repository\SubscriptionsRepository;
-use Crm\SubscriptionsModule\Repository\SubscriptionTypesRepository;
 use Crm\UsersModule\Repository\AddressesRepository;
 use DateTime;
 use League\Event\AbstractListener;
@@ -50,11 +49,11 @@ public function handle(EventInterface $event)
             return;
         }
 
-        if ($payment->subscription_type->type == SubscriptionTypesRepository::TYPE_PRODUCT) {
+        if ($payment->subscription_type->no_subscription) {
             return;
         }
 
-        if (in_array($payment->status, [PaymentsRepository::STATUS_PAID, PaymentsRepository::STATUS_PREPAID]) && !$payment->subscription_type->no_subscription) {
+        if (in_array($payment->status, [PaymentsRepository::STATUS_PAID, PaymentsRepository::STATUS_PREPAID])) {
             $this->createSubscriptionFromPayment($payment, $event);
         }
     }