diff --git a/src/subs.c b/src/subs.c
index 687537d9b..c5c6b5a34 100644
--- a/src/subs.c
+++ b/src/subs.c
@@ -389,6 +389,7 @@ static int sub__remove_normal(struct mosquitto *context, struct mosquitto__subhi
 				if(context->subs[i] && context->subs[i]->hier == subhier){
 					mosquitto__free(context->subs[i]);
 					context->subs[i] = NULL;
+					context->sub_count--;
 					break;
 				}
 			}
@@ -429,6 +430,7 @@ static int sub__remove_shared(struct mosquitto *context, struct mosquitto__subhi
 
 						mosquitto__free(context->subs[i]);
 						context->subs[i] = NULL;
+						context->sub_count--;
 						break;
 					}
 				}