diff --git a/js/button.js b/js/button.js
index b359a6ec62..bbce6690e8 100644
--- a/js/button.js
+++ b/js/button.js
@@ -31,9 +31,9 @@
 
     state = state + 'Text'
 
-    if (!data.resetText) $el.data('resetText', $el[val]())
+    if (data.resetText == null) $el.data('resetText', $el[val]())
 
-    $el[val](data[state] || this.options[state])
+    $el[val](data[state] == null ? this.options[state] : data[state])
 
     // push to event loop to allow forms to submit
     setTimeout($.proxy(function () {
diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index 10bff14429..da65ae3837 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -57,7 +57,27 @@ $(function () {
         start()
       }, 0)
     }, 0)
+  })
 
+  test('should work with an empty string as reset state', function () {
+    var btn = $('<button class="btn" data-loading-text="fat"></button>')
+    equal(btn.html(), '', 'btn text equals ""')
+    btn.bootstrapButton('loading')
+    equal(btn.html(), 'fat', 'btn text equals fat')
+    stop()
+    setTimeout(function () {
+      ok(btn.attr('disabled'), 'btn is disabled')
+      ok(btn.hasClass('disabled'), 'btn has disabled class')
+      start()
+      stop()
+      btn.bootstrapButton('reset')
+      equal(btn.html(), '', 'btn text equals ""')
+      setTimeout(function () {
+        ok(!btn.attr('disabled'), 'btn is not disabled')
+        ok(!btn.hasClass('disabled'), 'btn does not have disabled class')
+        start()
+      }, 0)
+    }, 0)
   })
 
   test('should toggle active', function () {