diff --git a/CHANGELOG.md b/CHANGELOG.md
index 455a8dfc..da2d46fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 * Make value optional in param-list
 * Frame processing routines are member functions
+* Fix on_headers called twice from basic_parser_v1
 
 API Changes:
 
diff --git a/include/beast/http/impl/basic_parser_v1.ipp b/include/beast/http/impl/basic_parser_v1.ipp
index 60fd866d..c64799a6 100644
--- a/include/beast/http/impl/basic_parser_v1.ipp
+++ b/include/beast/http/impl/basic_parser_v1.ipp
@@ -916,13 +916,12 @@ write(boost::asio::const_buffer const& buffer, error_code& ec)
                 return err(parse_error::bad_on_headers_rv);
             }
             s_ = s_headers_done;
-            goto redo;
+            // fall through
         }
 
         case s_headers_done:
         {
             BOOST_ASSERT(! cb_);
-            call_on_headers(ec);
             if(ec)
                 return errc();
             bool const hasBody =