diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl
index abe15d9ff..ebcf6fa58 100644
--- a/src/ejabberd_sm.erl
+++ b/src/ejabberd_sm.erl
@@ -525,7 +525,15 @@ do_route(From, To, #xmlel{} = Packet) ->
 	  case Mod:get_sessions(LUser, LServer, LResource) of
 	    [] ->
 		case Name of
-		  <<"message">> -> route_message(From, To, Packet);
+		  <<"message">> ->
+		      case xml:get_attr_s(<<"type">>, Attrs) of
+			<<"chat">> -> route_message(From, To, Packet);
+			<<"error">> -> ok;
+			_ ->
+			    Err = jlib:make_error_reply(Packet,
+							?ERR_SERVICE_UNAVAILABLE),
+			    ejabberd_router:route(To, From, Err)
+		      end;
 		  <<"iq">> ->
 		      case xml:get_attr_s(<<"type">>, Attrs) of
 			<<"error">> -> ok;