diff --git a/src/mod_offline_sql.erl b/src/mod_offline_sql.erl
index b9cf9c96e..a5dcc209b 100644
--- a/src/mod_offline_sql.erl
+++ b/src/mod_offline_sql.erl
@@ -267,9 +267,15 @@ get_and_del_spool_msg_t(LServer, LUser) ->
 		    ejabberd_sql:sql_query_t(
                       ?SQL("select @(username)s, @(xml)s from spool where "
                            "username=%(LUser)s and %(LServer)H order by seq;")),
-		ejabberd_sql:sql_query_t(
-                  ?SQL("delete from spool where"
-                       " username=%(LUser)s and %(LServer)H;")),
-		Result
+		DResult =
+		    ejabberd_sql:sql_query_t(
+                      ?SQL("delete from spool where"
+                           " username=%(LUser)s and %(LServer)H;")),
+		case {Result, DResult} of
+		    {{selected, Rs}, {updated, DC}} when length(Rs) /= DC ->
+			ejabberd_sql:restart(concurent_insert);
+		    _ ->
+			Result
+		end
 	end,
     ejabberd_sql:sql_transaction(LServer, F).