diff --git a/modules/Link.js b/modules/Link.js
index 3c105156ea..65d4d7e165 100644
--- a/modules/Link.js
+++ b/modules/Link.js
@@ -66,7 +66,6 @@ const Link = React.createClass({
   getDefaultProps() {
     return {
       onlyActiveOnIndex: false,
-      className: '',
       style: {}
     }
   },
@@ -119,7 +118,7 @@ const Link = React.createClass({
       if (activeClassName || (activeStyle != null && !isEmptyObject(activeStyle))) {
         if (router.isActive(location, onlyActiveOnIndex)) {
           if (activeClassName)
-            props.className += props.className === '' ? activeClassName : ` ${activeClassName}`
+            props.className = `${props.className || ''} ${activeClassName}`.trim()
 
           if (activeStyle)
             props.style = { ...props.style, ...activeStyle }
diff --git a/modules/__tests__/Link-test.js b/modules/__tests__/Link-test.js
index d5c8b72c19..39e78c1b28 100644
--- a/modules/__tests__/Link-test.js
+++ b/modules/__tests__/Link-test.js
@@ -29,6 +29,15 @@ describe('A <Link>', function () {
     node = document.createElement('div')
   })
 
+  it('should not render unnecessary class=""', function () {
+    render((
+      <Link to="/something" />
+    ), node, function () {
+      const a = node.querySelector('a')
+      expect(a.hasAttribute('class')).toBe(false)
+    })
+  })
+
   it('knows how to make its href', function () {
     class LinkWrapper extends Component {
       render() {