Fix refresh freeze

Change-Id: I7a46abd6d61fcbe39745ece36843380e43c8e725