diff --git a/lib/Models/SubscriberSegment.php b/lib/Models/SubscriberSegment.php
index 2874aecabc..9ffc0c9ae1 100644
--- a/lib/Models/SubscriberSegment.php
+++ b/lib/Models/SubscriberSegment.php
@@ -21,10 +21,7 @@ class SubscriberSegment extends Model {
       foreach($segment_ids as $segment_id) {
 
         // do not remove subscriptions to the WP Users segment
-        if(
-          $wp_segment !== false
-          && ($wp_segment->id === (int)$segment_id)
-        ) {
+        if($wp_segment !== false && (int)$wp_segment->id === (int)$segment_id) {
           continue;
         }
 
diff --git a/tests/unit/Models/SubscriberSegmentTest.php b/tests/unit/Models/SubscriberSegmentTest.php
index e19ed69096..42774147d8 100644
--- a/tests/unit/Models/SubscriberSegmentTest.php
+++ b/tests/unit/Models/SubscriberSegmentTest.php
@@ -77,6 +77,44 @@ class SubscriberSegmentTest extends \MailPoetTest {
     expect($subscribed_segments[0]['name'])->equals($this->segment_2->name);
   }
 
+  function testItDoesNotUnsubscribeFromWPSegment() {
+    $subscriber = $this->subscriber;
+    $segment_1 = $this->segment_1;
+    $segment_1->type = Segment::TYPE_WP_USERS;
+    $segment_1->save();
+    $segment_2 = $this->segment_2;
+    $subscriber_segment = SubscriberSegment::createOrUpdate(
+      array(
+        'subscriber_id' => $subscriber->id,
+        'segment_id' => $segment_1->id,
+        'status' => Subscriber::STATUS_SUBSCRIBED
+      )
+    );
+    $subscriber_segment = SubscriberSegment::createOrUpdate(
+      array(
+        'subscriber_id' => $subscriber->id,
+        'segment_id' => $this->segment_2->id,
+        'status' => Subscriber::STATUS_SUBSCRIBED
+      )
+    );
+
+    // verify that subscriber is subscribed to 2 segments
+    $subscriber = Subscriber::findOne($subscriber->id)->withSubscriptions();
+    expect($subscriber->subscriptions[0]['status'])->equals(Subscriber::STATUS_SUBSCRIBED);
+    expect($subscriber->subscriptions[0]['segment_id'])->equals($segment_1->id);
+    expect($subscriber->subscriptions[1]['status'])->equals(Subscriber::STATUS_SUBSCRIBED);
+    expect($subscriber->subscriptions[1]['segment_id'])->equals($segment_2->id);
+
+    // verify that subscriber is not subscribed only to the non-WP segment (#2)
+    SubscriberSegment::unsubscribeFromSegments($subscriber, array($segment_1->id, $segment_2->id));
+    $subscriber = Subscriber::findOne($subscriber->id)->withSubscriptions();
+
+    expect($subscriber->subscriptions[0]['status'])->equals(Subscriber::STATUS_SUBSCRIBED);
+    expect($subscriber->subscriptions[0]['segment_id'])->equals($segment_1->id);
+    expect($subscriber->subscriptions[1]['status'])->equals(Subscriber::STATUS_UNSUBSCRIBED);
+    expect($subscriber->subscriptions[1]['segment_id'])->equals($segment_2->id);
+  }
+
   function testItCanUnsubscribeFromAllSegments() {
     SubscriberSegment::createOrUpdate(array(
       'subscriber_id' => $this->subscriber->id,