diff --git a/pokemongo_bot/cell_workers/nickname_pokemon.py b/pokemongo_bot/cell_workers/nickname_pokemon.py
index cda206ad20..e521cadfba 100644
--- a/pokemongo_bot/cell_workers/nickname_pokemon.py
+++ b/pokemongo_bot/cell_workers/nickname_pokemon.py
@@ -27,7 +27,7 @@ def _get_inventory_pokemon(self,inventory_dict):
             except KeyError:
                 pass
             else:
-                if not pokemon.get('is_egg',False):
+                if not pokemon.get('is_egg',False) and not (pokemon.get('favorite', 0) == 1 and self.config.get('dont_nickname_favorite',False)):
                     pokemon_data.append(pokemon)
         return pokemon_data