diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index a49780701e..4e86a268ab 100755
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -482,6 +482,19 @@ zapretry:
 		}
 	}
 
+#ifndef NO_ZAPTEL_PANIC_WORKAROUND
+	/* Take out of conference */
+	/* Add us to the conference */
+	ztc.chan = 0;	
+	ztc.confno = 0;
+	ztc.confmode = 0;
+	if (ioctl(fd, ZT_SETCONF, &ztc)) {
+		ast_log(LOG_WARNING, "Error setting conference\n");
+	}
+	usleep(1);
+	if (fd != chan->fds[0])
+		close(fd);
+#else		
 	if (fd != chan->fds[0])
 		close(fd);
 	else {
@@ -494,7 +507,7 @@ zapretry:
 			ast_log(LOG_WARNING, "Error setting conference\n");
 		}
 	}
-
+#endif
 	if (!(confflags & CONFFLAG_QUIET) && !(confflags & CONFFLAG_MONITOR) && !(confflags & CONFFLAG_ADMIN))
 		conf_play(conf, LEAVE);