diff --git a/src/main/java/kieker/analysis/util/graph/util/dot/DotGraphWriter.java b/src/main/java/kieker/analysis/util/graph/util/dot/DotGraphWriter.java
index 374768c77c3de6c3b181d9893efd827cf73d7bfa..5c13600aef1e450226ed9b1c75882ad031616257 100644
--- a/src/main/java/kieker/analysis/util/graph/util/dot/DotGraphWriter.java
+++ b/src/main/java/kieker/analysis/util/graph/util/dot/DotGraphWriter.java
@@ -62,13 +62,17 @@ public class DotGraphWriter {
 	public void addDefaultNodeAttributes(final Map<String, String> attributes) throws IOException {
 		checkState(DotWriterState.STARTED);
 
-		writer.writeln(DotGraph.NODE + ' ' + assembleAttributes(attributes));
+		if (attributes != null && !attributes.isEmpty()) {
+			writer.writeln(DotGraph.NODE + ' ' + assembleAttributes(attributes));
+		}
 	}
 
 	public void addDefaultEdgeAttributes(final Map<String, String> attributes) throws IOException {
 		checkState(DotWriterState.STARTED);
 
-		writer.writeln(DotGraph.EDGE + ' ' + assembleAttributes(attributes));
+		if (attributes != null && !attributes.isEmpty()) {
+			writer.writeln(DotGraph.EDGE + ' ' + assembleAttributes(attributes));
+		}
 	}
 
 	public void addGraphAttribute(final String key, final String value) throws IOException {