diff --git a/spec/app/event-emitter-spec.coffee b/spec/app/event-emitter-spec.coffee
index 76bac0284..ced8951ac 100644
--- a/spec/app/event-emitter-spec.coffee
+++ b/spec/app/event-emitter-spec.coffee
@@ -1,7 +1,7 @@
 _ = require 'underscore'
 EventEmitter = require 'event-emitter'
 
-describe "EventEmitter mixin", ->
+fdescribe "EventEmitter mixin", ->
   [object, fooHandler1, fooHandler2, barHandler] = []
 
   beforeEach ->
diff --git a/src/app/event-emitter.coffee b/src/app/event-emitter.coffee
index 387038453..a1ea474df 100644
--- a/src/app/event-emitter.coffee
+++ b/src/app/event-emitter.coffee
@@ -36,13 +36,13 @@ module.exports =
         for handler in new Array(handlers...)
           _.remove(handlers, handler)
           @off eventName, handler
-          return
+        return
       else
         for eventName, handlers of @eventHandlersByNamespace?[namespace] ? {}
           for handler in new Array(handlers...)
             _.remove(handlers, handler)
             @off eventName, handler
-            return
+        return
     else
       if handler
         _.remove(@eventHandlersByEventName[eventName], handler)