diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55b2582bd2c..cf8e2f6d330 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ vNext
 **Fixes**
 
 - Fixes regex InfluxDB queries intoduced in 1.6.0 (PR #500)
+- Bug in when using % sign in legends (aliases), fixed by removing url decoding of metric names (Fixes #506)
 
 # 1.6.0 (2014-06-16)
 
diff --git a/src/app/filters/all.js b/src/app/filters/all.js
index 0a6dd12b816..e4ffe7088c8 100755
--- a/src/app/filters/all.js
+++ b/src/app/filters/all.js
@@ -114,10 +114,4 @@ define(['angular', 'jquery', 'underscore', 'moment'], function (angular, $, _, m
     };
   });
 
-  module.filter('urlDecode', function() {
-    return function(input) {
-      return decodeURIComponent(input);
-    };
-  });
-
 });
\ No newline at end of file
diff --git a/src/app/panels/filtering/module.html b/src/app/panels/filtering/module.html
index 3c95fbd3751..96b5751ce7d 100755
--- a/src/app/panels/filtering/module.html
+++ b/src/app/panels/filtering/module.html
@@ -17,7 +17,7 @@
             </a>
               <ul class="dropdown-menu">
                 <li ng-repeat="option in filter.options">
-                  <a ng-click="filterOptionSelected(filter, option)">{{option.text | urlDecode}}</a>
+                  <a ng-click="filterOptionSelected(filter, option)">{{option.text}}</a>
                 </li>
               </ul>
           </li>
diff --git a/src/app/panels/graph/legend.html b/src/app/panels/graph/legend.html
index 45eca738848..84aab5020f6 100755
--- a/src/app/panels/graph/legend.html
+++ b/src/app/panels/graph/legend.html
@@ -9,7 +9,7 @@
     </i>
     <span class='small histogram-legend-item'>
       <a ng-click="toggleSeries(series, $event)" data-unique="1" data-placement="{{series.yaxis === 2 ? 'bottomRight' : 'bottomLeft'}}">
-        {{series.alias | urlDecode}}
+        {{series.alias}}
       </a>
       <span ng-if="panel.legend.values">
         <span ng-show="panel.legend.current">