diff --git a/config/speechd.conf b/config/speechd.conf
index 59d01df..eafd2d5 100644
--- a/config/speechd.conf
+++ b/config/speechd.conf
@@ -224,7 +224,7 @@ AudioOutputMethod "alsa"
 #    either relative (to etc/speech-dispatcher/modules/) or absolute
 
 #AddModule "espeak"                   "sd_espeak"    "espeak.conf"
-#AddModule "espeak-ng"                "sd_espeak-ng" "espeak-ng.conf"
+AddModule "espeak-ng"                "sd_espeak-ng" "espeak-ng.conf"
 #AddModule "festival"                 "sd_festival"  "festival.conf"
 #AddModule "flite"                    "sd_flite"     "flite.conf"
 #AddModule "ivona"                    "sd_ivona"     "ivona.conf"
@@ -258,7 +258,7 @@ AudioOutputMethod "alsa"
 # The DefaultModule selects which output module is the default.  You
 # must use one of the names of the modules loaded with AddModule.
 
-DefaultModule espeak-generic
+DefaultModule espeak-ng
 
 # The LanguageDefaultModule selects which output modules are prefered
 # for specified languages.
diff --git a/src/audio/alsa.c b/src/audio/alsa.c
index d4ed89e..cefcb96 100644
--- a/src/audio/alsa.c
+++ b/src/audio/alsa.c
@@ -326,10 +326,10 @@ int wait_for_poll(spd_alsa_id_t * id, struct pollfd *alsa_poll_fds,
 		   descriptors */
 		revents = id->alsa_poll_fds[count - 1].revents;
 		if (0 != revents) {
-			if (revents & POLLIN) {
-				MSG(4, "wait_for_poll: stop requested");
-				return 1;
-			}
+			//if (revents & POLLIN) {
+			//	MSG(4, "wait_for_poll: stop requested");
+			//	return 1;
+			//}
 		}
 
 		/* Check the first count-1 descriptors for ALSA events */
