diff --git a/src/collapse/collapse.js b/src/collapse/collapse.js
index 8f24d29ba7..74b6d4a3bc 100644
--- a/src/collapse/collapse.js
+++ b/src/collapse/collapse.js
@@ -17,6 +17,10 @@ angular.module('ui.bootstrap.collapse', [])
         }
 
         function collapse() {
+          if(! element.hasClass('collapse') && ! element.hasClass('in')) {
+            return collapseDone();
+          }
+
           element
             // IMPORTANT: The height must be set before adding "collapsing" class.
             // Otherwise, the browser attempts to animate from height 0 (in