diff --git a/Event/DAQEvent/include/Event/ODIN.h b/Event/DAQEvent/include/Event/ODIN.h
index fdff703971dbae5c282221fdc9458c67b1d2a782..2a42dcd3c6e4f0d4f976e3abe16a2abfd2ac4009 100644
--- a/Event/DAQEvent/include/Event/ODIN.h
+++ b/Event/DAQEvent/include/Event/ODIN.h
@@ -97,7 +97,13 @@ namespace LHCb {
     }
   } // namespace ODINImplementation::details
 
-  namespace ODINImplementation::v7 {
+  namespace
+#ifndef ODIN_WITHOUT_GAUDI
+      ODINImplementation::v7
+#else
+      ODINImplementation::v7_standalone
+#endif
+  {
 
     struct ODIN final
 #ifndef ODIN_WITHOUT_GAUDI
@@ -371,6 +377,9 @@ namespace LHCb {
 #endif
   } // namespace ODINImplementation::v7
 
+#ifndef ODIN_WITHOUT_GAUDI
   using ODIN = ODINImplementation::v7::ODIN;
-
+#else
+  using ODIN = ODINImplementation::v7_standalone::ODIN;
+#endif
 } // namespace LHCb