diff --git a/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
index fc450c001..b0b120c82 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
@@ -548,6 +548,10 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe
 				continue;
 			}
 
+			if ((comp instanceof ComponentAssembly) && !(comp instanceof Rocket)){
+				continue;
+			}
+
 			String name = cmEntry.name;
 			if (cmEntry.source instanceof Rocket) {
 				name = trans.get("componentanalysisdlg.TOTAL");