diff --git a/src/Linkifier.ts b/src/Linkifier.ts
index b5b3247c..74c03adc 100644
--- a/src/Linkifier.ts
+++ b/src/Linkifier.ts
@@ -15,8 +15,9 @@ const ipClause = '((\\d{1,3}\\.){3}\\d{1,3})';
 const portClause = '(:\\d{1,5})';
 const hostClause = '((' + domainBodyClause + '\\.' + tldClause + ')|' + ipClause + ')' + portClause + '?';
 const pathClause = '(\\/[\\/\\w\\.-]*)*';
+const queryStringClause = '(\\?[\\w\\[\\]\\(\\)\\/\\?\\!#@$&\'*+,:;]*)?';
 const negatedPathCharacterSet = '[^\\/\\w\\.-]+';
-const bodyClause = hostClause + pathClause;
+const bodyClause = hostClause + pathClause + queryStringClause;
 const start = '(?:^|' + negatedDomainCharacterSet + ')(';
 const end = ')($|' + negatedPathCharacterSet + ')';
 const strictUrlRegex = new RegExp(start + protocolClause + bodyClause + end);