diff --git a/ILSpy/Languages/CSharpLanguage.cs b/ILSpy/Languages/CSharpLanguage.cs
index c59a3fec6..b1686836c 100644
--- a/ILSpy/Languages/CSharpLanguage.cs
+++ b/ILSpy/Languages/CSharpLanguage.cs
@@ -222,6 +222,11 @@ namespace ICSharpCode.ILSpy
 								removedSymbols.Add(pd.GetSymbol());
 							}
 							break;
+						case CustomEventDeclaration ced:
+						case IndexerDeclaration id:
+							node.Remove();
+							removedSymbols.Add(node.GetSymbol());
+							break;
 					}
 				}
 				if (ctorDecl?.Initializer.ConstructorInitializerType == ConstructorInitializerType.This)
@@ -291,7 +296,7 @@ namespace ICSharpCode.ILSpy
 			}
 			foreach (var p in type.Properties)
 			{
-				if (!p.MetadataToken.IsNil && p.IsStatic == isStatic)
+				if (!p.MetadataToken.IsNil && p.IsStatic == isStatic && !p.IsIndexer)
 					members.Add(p.MetadataToken);
 			}
 			foreach (var ctor in type.Methods)