diff --git a/lib/core-net/output.c b/lib/core-net/output.c
index bcbc6d54d..6f9ecc83c 100644
--- a/lib/core-net/output.c
+++ b/lib/core-net/output.c
@@ -170,6 +170,11 @@ int lws_issue_raw(struct lws *wsi, unsigned char *buf, size_t len)
 							-1 : (int)real_len;
 			}
 #endif
+#endif
+#if defined(LWS_ROLE_WS)
+			/* Since buflist_out flushed, we're not inside a frame any more */
+			if (wsi->ws)
+				wsi->ws->inside_frame = 0;
 #endif
 		}
 		/* always callback on writeable */