diff --git a/openmc/summary.py b/openmc/summary.py
index 63ed665169..a1ee2dcd66 100644
--- a/openmc/summary.py
+++ b/openmc/summary.py
@@ -123,7 +123,8 @@ class Summary:
     def _read_surfaces(self):
         for group in self._f['geometry/surfaces'].values():
             surface = openmc.Surface.from_hdf5(group)
-            self._fast_surfaces[surface.id] = surface
+            if surface:
+                self._fast_surfaces[surface.id] = surface
 
     def _read_cells(self):
 
diff --git a/openmc/surface.py b/openmc/surface.py
index d71e73788e..3c2c550101 100644
--- a/openmc/surface.py
+++ b/openmc/surface.py
@@ -455,7 +455,9 @@ class Surface(IDManagerMixin, ABC):
 
         surface_id = int(group.name.split('/')[-1].lstrip('surface '))
         name = group['name'][()].decode() if 'name' in group else ''
-        surf_type = group['type'][()].decode()
+        surf_type = group['geom_type'][()].decode()
+        if surf_type == 'dagmc':
+            return
         bc = group['boundary_type'][()].decode()
         coeffs = group['coefficients'][...]
         kwargs = {'boundary_type': bc, 'name': name, 'surface_id': surface_id}
diff --git a/openmc/universe.py b/openmc/universe.py
index f7ae0390ac..c3f4e36ced 100644
--- a/openmc/universe.py
+++ b/openmc/universe.py
@@ -694,6 +694,9 @@ class DAGMCUniverse(UniverseBase):
     def get_all_cells(self, memo=None):
         return OrderedDict()
 
+    def get_all_materials(self, memo=None):
+        return OrderedDict()
+
     def create_xml_subelement(self, xml_element, memo=None):
 
         if memo and self in memo:
diff --git a/tests/regression_tests/dagmc/legacy/inputs_true.dat b/tests/regression_tests/dagmc/legacy/inputs_true.dat
index 769a3384c3..ecc5d7373a 100644
--- a/tests/regression_tests/dagmc/legacy/inputs_true.dat
+++ b/tests/regression_tests/dagmc/legacy/inputs_true.dat
@@ -1,4 +1,8 @@
 <?xml version='1.0' encoding='utf-8'?>
+<geometry>
+  <dagmc filename="dagmc.h5m" id="1" name="" />
+</geometry>
+<?xml version='1.0' encoding='utf-8'?>
 <materials>
   <material depletable="true" id="40" name="no-void fuel">
     <density units="g/cc" value="11" />
@@ -22,7 +26,6 @@
       <parameters>-4 -4 -4 4 4 4</parameters>
     </space>
   </source>
-  <dagmc>true</dagmc>
 </settings>
 <?xml version='1.0' encoding='utf-8'?>
 <tallies>
diff --git a/tests/regression_tests/dagmc/legacy/test.py b/tests/regression_tests/dagmc/legacy/test.py
index 5af18e5c8c..76b76fbda0 100644
--- a/tests/regression_tests/dagmc/legacy/test.py
+++ b/tests/regression_tests/dagmc/legacy/test.py
@@ -26,6 +26,10 @@ def model():
 
     model.settings.dagmc = True
 
+    # geometry
+    dag_univ = openmc.DAGMCUniverse("dagmc.h5m")
+    model.geometry = openmc.Geometry(root=dag_univ)
+
     # tally
     tally = openmc.Tally()
     tally.scores = ['total']