diff --git a/source/Discord.hx b/source/Discord.hx
index 253a4f59a..2802e87c7 100644
--- a/source/Discord.hx
+++ b/source/Discord.hx
@@ -28,6 +28,11 @@ class DiscordClient
 		DiscordRpc.shutdown();
 	}
 
+	public static function shutdown()
+	{
+		DiscordRpc.shutdown();
+	}
+	
 	static function onReady()
 	{
 		DiscordRpc.presence({
diff --git a/source/TitleState.hx b/source/TitleState.hx
index c91dc54eb..e643ac1a8 100644
--- a/source/TitleState.hx
+++ b/source/TitleState.hx
@@ -96,6 +96,10 @@ class TitleState extends MusicBeatState
 
 		#if desktop
 		DiscordClient.initialize();
+		
+		Application.current.onExit.add (function (exitCode) {
+			DiscordClient.shutdown();
+		 });
 		#end
 	}