diff --git a/src/Tokenizer.js b/src/Tokenizer.js
index eed2a9b994..b834832a02 100644
--- a/src/Tokenizer.js
+++ b/src/Tokenizer.js
@@ -13,7 +13,7 @@ function outputLink(cap, link, raw, lexer) {
 
   if (cap[0].charAt(0) !== '!') {
     lexer.state.inLink = true;
-    return {
+    const token = {
       type: 'link',
       raw,
       href,
@@ -21,6 +21,8 @@ function outputLink(cap, link, raw, lexer) {
       text,
       tokens: lexer.inlineTokens(text, [])
     };
+    lexer.state.inLink = false;
+    return token;
   } else {
     return {
       type: 'image',
diff --git a/test/specs/new/autolink_after_link.html b/test/specs/new/autolink_after_link.html
new file mode 100644
index 0000000000..aa166def25
--- /dev/null
+++ b/test/specs/new/autolink_after_link.html
@@ -0,0 +1,3 @@
+<p><a href="https://github.com">Github</a></p>
+
+<p><a href="https://github.com">https://github.com</a></p>
diff --git a/test/specs/new/autolink_after_link.md b/test/specs/new/autolink_after_link.md
new file mode 100644
index 0000000000..10d99898fd
--- /dev/null
+++ b/test/specs/new/autolink_after_link.md
@@ -0,0 +1,6 @@
+---
+gfm: true
+---
+[Github](https://github.com)
+
+https://github.com