diff --git a/Adafruit_MQTT.cpp b/Adafruit_MQTT.cpp
index b0dbb16..557ee06 100644
--- a/Adafruit_MQTT.cpp
+++ b/Adafruit_MQTT.cpp
@@ -176,7 +176,7 @@ bool Adafruit_MQTT::subscribe(Adafruit_MQTT_Subscribe *sub) {
   for (i=0; i<MAXSUBSCRIPTIONS; i++) {
     if (subscriptions[i] == sub) {
       DEBUG_PRINTLN(F("Already subscribed"));
-      break;
+      return true;
     }
   }
   if (i==MAXSUBSCRIPTIONS) { // add to subscriptionlist
@@ -184,14 +184,13 @@ bool Adafruit_MQTT::subscribe(Adafruit_MQTT_Subscribe *sub) {
       if (subscriptions[i] == 0) {
         DEBUG_PRINT(F("Added sub ")); DEBUG_PRINTLN(i);
         subscriptions[i] = sub;
-        break;
+        return true;
       }
     }
   }
-  if (i==MAXSUBSCRIPTIONS) {
-    DEBUG_PRINTLN(F("no more subscription space :("));
-    return false;
-  }
+
+  DEBUG_PRINTLN(F("no more subscription space :("));
+  return false;
 }
 
 Adafruit_MQTT_Subscribe *Adafruit_MQTT::readSubscription(int16_t timeout) {
diff --git a/Adafruit_MQTT.h b/Adafruit_MQTT.h
index 909ee58..dc703bc 100644
--- a/Adafruit_MQTT.h
+++ b/Adafruit_MQTT.h
@@ -127,7 +127,7 @@ class Adafruit_MQTT {
   bool publish(const char *topic, const char *payload, uint8_t qos);
 
   // Add a subscription to receive messages for a topic.  Returns true if the
-  // subscription could be added, false otherwise.
+  // subscription could be added or was already present, false otherwise.
   bool subscribe(Adafruit_MQTT_Subscribe *sub);
 
   // Check if any subscriptions have new messages.  Will return a reference to