diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c
index 8c1992323..ba83a69dd 100644
--- a/src/modules/battery/e_mod_main.c
+++ b/src/modules/battery/e_mod_main.c
@@ -115,8 +115,9 @@ _gc_shutdown(E_Gadcon_Client *gcc)
 #endif
 
    inst = gcc->data;
-   battery_config->instances =
-     eina_list_remove(battery_config->instances, inst);
+   if (battery_config)
+     battery_config->instances =
+       eina_list_remove(battery_config->instances, inst);
    evas_object_del(inst->o_battery);
    if (inst->warning)
      {