diff --git a/src/App/Document.cpp b/src/App/Document.cpp
index d9f9bd23a2..fcdf62c794 100644
--- a/src/App/Document.cpp
+++ b/src/App/Document.cpp
@@ -399,8 +399,12 @@ void Document::exportGraphviz(std::ostream& out) const
             if(CSSubgraphs) {
                 if(!sgraph) {
                     auto group = GeoFeatureGroupExtension::getGroupOfObject(docObj);
-                    if(group)
-                        sgraph = GraphList[group];
+                    if(group) {
+                        if(docObj->isDerivedFrom(App::OriginFeature::getClassTypeId()))
+                            sgraph = GraphList[group->getExtensionByType<OriginGroupExtension>()->Origin.getValue()];
+                        else 
+                            sgraph = GraphList[group];
+                    }
                 }
                 if(!sgraph) {
                     if(docObj->isDerivedFrom(OriginFeature::getClassTypeId()))