diff --git a/src/core/containers/OperationContainer.jsx b/src/core/containers/OperationContainer.jsx
index 8a2d1675..a366a168 100644
--- a/src/core/containers/OperationContainer.jsx
+++ b/src/core/containers/OperationContainer.jsx
@@ -126,10 +126,10 @@ export default class OperationContainer extends PureComponent {
     } = this.props
 
     if(specPath) {
-      return specSelectors.specResolvedSubtree(specPath.toJS()) || Map()
+      return specSelectors.specResolvedSubtree(specPath.toJS())
     }
 
-    return specSelectors.specResolvedSubtree(["paths", path, method]) || Map()
+    return specSelectors.specResolvedSubtree(["paths", path, method])
   }
 
   requestResolvedSubtree = () => {
@@ -182,10 +182,10 @@ export default class OperationContainer extends PureComponent {
 
     const Operation = getComponent( "operation" )
 
-    const resolvedSubtree = this.getResolvedSubtree()
+    const resolvedSubtree = this.getResolvedSubtree() || Map()
 
     const operationProps = fromJS({
-      op: resolvedSubtree || Map(),
+      op: resolvedSubtree,
       tag,
       path,
       summary: unresolvedOp.getIn(["operation", "summary"]) || "",