diff --git a/CHANGELOG.md b/CHANGELOG.md
index b81921bb1b9..c7e93a01c77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 Fixes:
 - [core] Fixed a bug causing events to not being loaded when there's an escaped character in the event name
+- [core] Fixed a bug that was causing drill to crash when there's a percentage symbol in the event name
 - [gridfs] fixes for moving to Promises
 - [reports] Fixes report generation failure due to SSL error
 - [surveys] "Select one" text in the widget can be edited now
diff --git a/frontend/express/public/javascripts/countly/countly.template.js b/frontend/express/public/javascripts/countly/countly.template.js
index 5a8507b953e..ea20f47751e 100755
--- a/frontend/express/public/javascripts/countly/countly.template.js
+++ b/frontend/express/public/javascripts/countly/countly.template.js
@@ -3901,7 +3901,7 @@ Backbone.history.checkUrl = function() {
 
 Backbone.history.noHistory = function(hash) {
     if (history && history.replaceState) {
-        history.replaceState(undefined, undefined, hash);
+        history.replaceState(undefined, undefined, encodeURI(hash));
     }
     else {
         location.replace(hash);