diff --git a/Changes b/Changes
index 342715b25..c3637aeba 100644
--- a/Changes
+++ b/Changes
@@ -843,3 +843,7 @@ dechanown, dechanprot people.
 --Luke
 ===================================
 
+Small m_topic bug resolved
+--Luke
+===================================
+
diff --git a/src/channel.c b/src/channel.c
index 78327e2df..228583a37 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -3477,7 +3477,8 @@ int  m_topic(cptr, sptr, parc, parv)
 				    me.name, parv[0], name);
 				return 0;
 			}
-			topic = parv[2];
+			if (parc > 2)
+				topic = parv[2];
 		}
 		if (parc > 4)
 		{