diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 7e8fdaf01d..29e7c49723 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -11301,8 +11301,11 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
 				ast_set_flag(p, SIP_NEEDDESTROY);	
 				return 0;
 			}
-			if (p->subscribed != NONE)
+			if (p->subscribed != NONE) {
+				if (p->stateid > -1)
+					ast_extension_state_del(p->stateid, cb_extensionstate);
 				p->stateid = ast_extension_state_add(p->context, p->exten, cb_extensionstate, p);
+			}
 		}
 	}