diff --git a/UtilityApps/CMakeLists.txt b/UtilityApps/CMakeLists.txt
index e0962680774ec92b2b55dabc02b9e9aa20618b38..88368cb927178142772ea0f37069008e2496b0fa 100644
--- a/UtilityApps/CMakeLists.txt
+++ b/UtilityApps/CMakeLists.txt
@@ -30,14 +30,21 @@ dd4hep_add_executable(test_surfaces
   OPTIONAL [LCIO REQUIRED SOURCES src/test_surfaces.cpp])
 #-----------------------------------------------------------------------------------
 dd4hep_add_dictionary( G__teve 
-  SOURCES src/EvNavHand*.h
+  SOURCES src/EvNavHandler.h
   LINKDEF src/LinkDef.h )
+
+#-----------------------------------------------------------------------------------
+if ( ${DD4HEP_USE_LCIO} )
+  dd4hep_add_executable( teveLCIO
+    USES           [ROOT REQUIRED COMPONENTS TEve]
+                   [LCIO REQUIRED]
+                   DDRec
+    SOURCES        G__teve.cxx src/teve_display.cpp src/next_event_lcio.cpp
+ )
+endif()
+
 #-----------------------------------------------------------------------------------
 dd4hep_add_executable( teveDisplay 
   USES           [ROOT REQUIRED COMPONENTS TEve] DDRec
   SOURCES        src/teve_display.cpp src/next_event_dummy.cpp G__teve.cxx
 )
-#-----------------------------------------------------------------------------------
-dd4hep_add_executable( teveLCIO
-  USES           [ROOT REQUIRED COMPONENTS TEve] DDRec
-  OPTIONAL       [LCIO REQUIRED SOURCES src/teve_display.cpp src/next_event_lcio.cpp G__teve.cxx] )