diff --git a/spec/atom/line-folder-spec.coffee b/spec/atom/line-folder-spec.coffee
index 21f679896..c39414475 100644
--- a/spec/atom/line-folder-spec.coffee
+++ b/spec/atom/line-folder-spec.coffee
@@ -206,6 +206,9 @@ describe "LineFolder", ->
           fold.destroy()
           expect(folder.lineForScreenRow(0).text).toBe 'var quicksort = function () {'
 
+    it "doesn't raise an error when attempting to fold empty ranges", ->
+      folder.createFold(new Range([1, 1], [1, 1]))
+
   describe "when the buffer changes", ->
     [fold1, fold2] = []
     beforeEach ->
diff --git a/src/atom/line-folder.coffee b/src/atom/line-folder.coffee
index 380f725aa..e307dfde4 100644
--- a/src/atom/line-folder.coffee
+++ b/src/atom/line-folder.coffee
@@ -27,6 +27,7 @@ class LineFolder
     @lineMap.logLines(start, end)
 
   createFold: (bufferRange) ->
+    return if bufferRange.isEmpty()
     fold = new Fold(this, bufferRange)
     @registerFold(bufferRange.start.row, fold)
     oldScreenRange = @expandScreenRangeToLineEnds(@screenRangeForBufferRange(bufferRange))