diff --git a/pom.xml b/pom.xml
index 9f587dc..ad87c95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>org.vaadin.addons.flowingcode</groupId>
 	<artifactId>share-easy-addon</artifactId>
-	<version>1.1.1-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<name>Share Easy Add-on</name>
 	<description>Share Eady Add-on for Vaadin Flow</description>
 
diff --git a/src/main/resources/META-INF/resources/frontend/src/fc-sharee-connector.js b/src/main/resources/META-INF/resources/frontend/src/fc-sharee-connector.js
index 1cb3b05..6bc5181 100644
--- a/src/main/resources/META-INF/resources/frontend/src/fc-sharee-connector.js
+++ b/src/main/resources/META-INF/resources/frontend/src/fc-sharee-connector.js
@@ -94,16 +94,16 @@ window.fcShareeConnector = {
 	 */
 	_updateSocialShareLinks() {
 		Sharee.drivers['facebook'].prototype.getLink = function () {
-			return `https://facebook.com/sharer/sharer.php?u=${this.options?.shareLink}&t=${encodeURIComponent(this.options?.shareText)}`
+			return `https://facebook.com/sharer/sharer.php?u=${encodeURIComponent(this.options?.shareLink)}&t=${encodeURIComponent(this.options?.shareText)}`
 		}
 		Sharee.drivers['whatsapp'].prototype.getLink = function () {
-			return `https://wa.me?text=${this.options?.shareText} \n ${this.options?.shareLink}`
+			return `https://wa.me?text=${encodeURIComponent(this.options?.shareText)} \n ${encodeURIComponent(this.options?.shareLink)}`
 		}
 		Sharee.drivers['twitter'].prototype.getLink = function () {
-			return `https://twitter.com/intent/tweet?text=${encodeURIComponent(this.options?.shareText)}&url=${this.options?.shareLink}`
+			return `https://twitter.com/intent/tweet?text=${encodeURIComponent(this.options?.shareText)}&url=${encodeURIComponent(this.options?.shareLink)}`
 		}
 		Sharee.drivers['linkedin'].prototype.getLink = function () {
-			return `https://www.linkedin.com/shareArticle?url=${this.options?.shareLink}`
+			return `https://www.linkedin.com/shareArticle?url=${encodeURIComponent(this.options?.shareLink)}`
 		}
 	},