diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index ea9c0a819..b8ca4807a 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -7041,7 +7041,6 @@ winkflashdone:
 			break;
 		case SIG_EM:
 		case SIG_EM_E1:
-		case SIG_EMWINK:
 		case SIG_FEATD:
 		case SIG_SF:
 		case SIG_SFWINK:
@@ -7075,7 +7074,8 @@ winkflashdone:
 		case SIG_FEATB:
 		case SIG_SF_FEATDMF:
 		case SIG_SF_FEATB:
-			/* FGD MF *Must* wait for wink */
+		case SIG_EMWINK:
+			/* FGD MF and EMWINK *Must* wait for wink */
 			if (!ast_strlen_zero(p->dop.dialstr)) {
 				res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_DIAL, &p->dop);
 				if (res < 0) {
diff --git a/channels/sig_analog.c b/channels/sig_analog.c
index 49b9c6bd5..9a5081ebe 100644
--- a/channels/sig_analog.c
+++ b/channels/sig_analog.c
@@ -2670,7 +2670,6 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_
 			break;
 		case ANALOG_SIG_EM:
 		case ANALOG_SIG_EM_E1:
-		case ANALOG_SIG_EMWINK:
 		case ANALOG_SIG_FEATD:
 		case ANALOG_SIG_SF:
 		case ANALOG_SIG_SFWINK:
@@ -2704,7 +2703,8 @@ static struct ast_frame *__analog_handle_event(struct analog_pvt *p, struct ast_
 		case ANALOG_SIG_FEATB:
 		case ANALOG_SIG_SF_FEATDMF:
 		case ANALOG_SIG_SF_FEATB:
-			/* FGD MF *Must* wait for wink */
+		case ANALOG_SIG_EMWINK:
+			/* FGD MF and EMWINK *Must* wait for wink */
 			if (!ast_strlen_zero(p->dop.dialstr)) {
 				res = analog_dial_digits(p, ANALOG_SUB_REAL, &p->dop);
 				if (res < 0) {