diff --git a/ChaosBot/Discord/Services/CommandHandler.cs b/ChaosBot/Discord/Services/CommandHandler.cs
index 106b3fd..d00c5a3 100644
--- a/ChaosBot/Discord/Services/CommandHandler.cs
+++ b/ChaosBot/Discord/Services/CommandHandler.cs
@@ -56,9 +56,16 @@ namespace ChaosBot.Discord.Services
                 int argPos = 0;
                 
                 string prefix = ConfigurationRepository.GetValue<string>("Discord:Prefix", context.Guild.Id, "!");
-                if (!(message.HasMentionPrefix(_client.CurrentUser, ref argPos) || message.HasStringPrefix(prefix, ref argPos))) 
+                if (!(message.HasMentionPrefix(_client.CurrentUser, ref argPos) ||
+                      message.HasStringPrefix(prefix, ref argPos)))
+                {
+                    ExperienceHandler.addXP(context.Guild.Id, context.User.Id);
                     return;
+                }
 
+                if(Convert.ToBoolean(ConfigurationRepository.GetValue<string>("Experience:Commands", context.Guild.Id, "false")))
+                    ExperienceHandler.addXP(context.Guild.Id, context.User.Id);
+                
                 await _commands.ExecuteAsync(context, argPos, _services); 
             }
             catch (Exception ex)