diff --git a/Changes b/Changes
index afab348cb..db7145157 100644
--- a/Changes
+++ b/Changes
@@ -2430,3 +2430,4 @@ seen. gmtime warning still there
 - Added HOOKTYPE_REMOTE_QUIT
 - Added beta18 release notes (might be changed)
 - Added HOOKTYPE_REHASHFLAG (triggered when /rehash is passed a flag)
+- Fix for HOOKTYPE_REMOTE_QUIT (was called for local quits too)
diff --git a/src/s_misc.c b/src/s_misc.c
index 154d3a35a..94a6776bb 100644
--- a/src/s_misc.c
+++ b/src/s_misc.c
@@ -655,7 +655,10 @@ static void exit_one_client(aClient *cptr, aClient *sptr, aClient *from, char *c
 					    sptr->user->server, sptr->name,
 					    sptr->user->username,
 					    sptr->user->realhost, comment);
-			RunHook2(HOOKTYPE_REMOTE_QUIT, sptr, comment);
+			if (!MyClient(sptr))
+			{
+				RunHook2(HOOKTYPE_REMOTE_QUIT, sptr, comment);
+			}
 			while ((mp = sptr->user->channel))
 				remove_user_from_channel(sptr, mp->chptr);