diff --git a/neo/idlib/MapFile.cpp b/neo/idlib/MapFile.cpp
index 84f21c03..44d21928 100644
--- a/neo/idlib/MapFile.cpp
+++ b/neo/idlib/MapFile.cpp
@@ -2974,8 +2974,6 @@ bool idMapFile::ConvertToValve220Format()
 			}
 #endif
 
-			// TODO if light purge flare patches
-
 			bool isBrushModel = ( ent->GetNumPrimitives() > 0 ) && ( idStr::Icmp( model.c_str(), name.c_str() ) == 0 );
 
 			// is this oldschool brushes & patches?
@@ -2994,6 +2992,13 @@ bool idMapFile::ConvertToValve220Format()
 					removedOrigin = true;
 				}
 
+				// purge flare patches from lights because we can't select lights in TrenchBroom
+				// that still have primitives
+				if( idStr::Icmp( classname, "light" ) == 0 )
+				{
+					ent->RemovePrimitiveData();
+				}
+
 				// convert brushes
 				for( int i = 0; i < ent->GetNumPrimitives(); i++ )
 				{