diff --git a/config.toml b/config.toml
index f8771ee..32bb0ce 100644
--- a/config.toml
+++ b/config.toml
@@ -8,6 +8,7 @@ pygmentsUseClasses = true
   description = "Android Developer, Kotlin fanatic and wannabe Rustacean"
   keywords = "homepage, blog, android, kotlin, programming"
   contentTypeName = "posts"
+  CommentoURL = "https://commento.msfjarvis.dev"
 
 [Menus]
   main = [
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index a2ca170..9107f70 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -11,8 +11,8 @@
   {{- end -}}
 </div>
 
-{{ if .Site.DisqusShortname -}}
+{{ if and .Site.Params.CommentoURL (and (not .Site.BuildDrafts) (not .Site.IsServer)) -}}
 <h2>Comments</h2>
-{{ template "_internal/disqus.html" . }}
+{{ partial "commento.html" . }}
 {{- end }}
 {{- end }}
diff --git a/layouts/partials/commento.html b/layouts/partials/commento.html
new file mode 100644
index 0000000..ff6766c
--- /dev/null
+++ b/layouts/partials/commento.html
@@ -0,0 +1,3 @@
+<div id="commento"></div>
+<script defer src="{{ .Site.Params.CommentoURL }}/js/commento.js"></script>
+<noscript>Please enable JavaScript to load the comments.</noscript>