diff --git a/src/packages/bracket-matcher/lib/bracket-matcher.coffee b/src/packages/bracket-matcher/lib/bracket-matcher.coffee
index 5fba6b280..e630842d2 100644
--- a/src/packages/bracket-matcher/lib/bracket-matcher.coffee
+++ b/src/packages/bracket-matcher/lib/bracket-matcher.coffee
@@ -168,11 +168,11 @@ module.exports =
       autoCompleteOpeningBracket = @isOpeningBracket(text) and not hasWordAfterCursor and not (@isQuote(text) and hasWordBeforeCursor)
       skipOverExistingClosingBracket = false
       if @isClosingBracket(text) and nextCharacter == text
-        if bracketMarker = _.find(@bracketMarkers, (marker) => editSession.getMarkerBufferRange(marker)?.end.isEqual(cursorBufferPosition))
+        if bracketMarker = _.find(@bracketMarkers, (marker) => marker.isValid() and marker.getBufferRange().end.isEqual(cursorBufferPosition))
           skipOverExistingClosingBracket = true
 
       if skipOverExistingClosingBracket
-        editSession.destroyMarker(bracketMarker)
+        bracketMarker.destroy()
         _.remove(@bracketMarkers, bracketMarker)
         editSession.moveCursorRight()
         false