diff --git a/src/main/java/com/github/psnrigner/discordrpcjava/DiscordRichPresence.java b/src/main/java/com/github/psnrigner/discordrpcjava/DiscordRichPresence.java
index f1921f3..a48682b 100644
--- a/src/main/java/com/github/psnrigner/discordrpcjava/DiscordRichPresence.java
+++ b/src/main/java/com/github/psnrigner/discordrpcjava/DiscordRichPresence.java
@@ -361,8 +361,12 @@ JsonObject toJson(long pid, long nonce)
         args.add("pid", new JsonPrimitive(pid));
 
         JsonObject activity = new JsonObject();
-        activity.add("state", new JsonPrimitive(this.getState()));
-        activity.add("details", new JsonPrimitive(this.getDetails()));
+        
+        if (!this.getState().trim().isEmpty())
+        	activity.add("state", new JsonPrimitive(this.getState()));
+
+        if (!this.getDetails().trim().isEmpty())
+        	activity.add("details", new JsonPrimitive(this.getDetails()));
 
         if (this.getStartTimestamp() != 0 || this.getEndTimestamp() != 0)
         {