diff --git a/src/module/decode/event/MessageActivityModel.java b/src/module/decode/event/MessageActivityModel.java
index ddcf17a5..25e38322 100644
--- a/src/module/decode/event/MessageActivityModel.java
+++ b/src/module/decode/event/MessageActivityModel.java
@@ -80,10 +80,13 @@ public class MessageActivityModel extends AbstractTableModel
             public void run()
             {
 				int messageCount = mMessages.size();
-				
-				mMessages.clear();
 
-				fireTableRowsDeleted( 0, messageCount - 1 );
+				if( messageCount > 0 )
+				{
+					mMessages.clear();
+
+					fireTableRowsDeleted( 0, messageCount - 1 );
+				}
             }
 		});
 	}