diff --git a/modules/joke/joke.sh b/modules/joke/joke.sh
index f85b094..500560e 100755
--- a/modules/joke/joke.sh
+++ b/modules/joke/joke.sh
@@ -1,6 +1,5 @@
 [ -f functions.sh ] && source functions.sh
 
-joke="$(curl -s 'http://tambal.azurewebsites.net/joke/random')"
-joke="${joke##*\":\"}"
-joke="${joke:0:-2}"
+joke="$(curl -s 'https://thatsagooden.tk/?api=txt&type=all')"
+joke="${joke//[[:space:]]/ }"
 msg "$2" "$joke"