diff --git a/dspace-api/src/main/java/org/dspace/eperson/SubscribeServiceImpl.java b/dspace-api/src/main/java/org/dspace/eperson/SubscribeServiceImpl.java
index 2e4d94f443..0f5d2ba319 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/SubscribeServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/SubscribeServiceImpl.java
@@ -131,7 +131,8 @@ public class SubscribeServiceImpl implements SubscribeService {
 
     @Override
     public boolean isSubscribed(Context context, EPerson eperson, DSpaceObject dSpaceObject) throws SQLException {
-        return subscriptionDAO.findByEPersonAndDso(context, eperson, dSpaceObject, -1, -1) != null;
+        List<Subscription> subscriptions = subscriptionDAO.findByEPersonAndDso(context, eperson, dSpaceObject, -1, -1);
+        return subscriptions != null && !subscriptions.isEmpty();
     }
 
     @Override
diff --git a/dspace-api/src/test/java/org/dspace/eperson/SubscribeServiceIT.java b/dspace-api/src/test/java/org/dspace/eperson/SubscribeServiceIT.java
index 945dd481d0..128b2e552b 100644
--- a/dspace-api/src/test/java/org/dspace/eperson/SubscribeServiceIT.java
+++ b/dspace-api/src/test/java/org/dspace/eperson/SubscribeServiceIT.java
@@ -213,6 +213,7 @@ public class SubscribeServiceIT extends AbstractIntegrationTestWithDatabase {
                                                               secondCollection, 100, 0);
 
         assertEquals(subscriptions.size(), 1);
+        assertThat(subscribeService.isSubscribed(context, subscribingUser, secondCollection), is(true));
 
 
         subscribeService.unsubscribe(context, subscribingUser, secondCollection);
@@ -222,6 +223,7 @@ public class SubscribeServiceIT extends AbstractIntegrationTestWithDatabase {
                                                               secondCollection, 100, 0);
 
         assertEquals(subscriptions.size(), 0);
+        assertThat(subscribeService.isSubscribed(context, subscribingUser, secondCollection), is(false));
     }
 
     @Test(expected = AuthorizeException.class)