diff --git a/Source/NSTextStorage.m b/Source/NSTextStorage.m
index 6a8001d51..06b92ae94 100644
--- a/Source/NSTextStorage.m
+++ b/Source/NSTextStorage.m
@@ -100,6 +100,7 @@ static NSNotificationCenter *nc = nil;
 
 - (void) removeLayoutManager: (NSLayoutManager*)obj
 {
+  [obj setTextStorage: nil];
   [_layoutManagers removeObjectIdenticalTo: obj];
 }