diff --git a/app/src/main/java/me/impy/aegis/KeyProfile.java b/app/src/main/java/me/impy/aegis/KeyProfile.java
index e89af775..aff6839f 100644
--- a/app/src/main/java/me/impy/aegis/KeyProfile.java
+++ b/app/src/main/java/me/impy/aegis/KeyProfile.java
@@ -13,7 +13,6 @@ import me.impy.aegis.helpers.TextDrawableHelper;
 public class KeyProfile implements Serializable {
     private String _code;
     private DatabaseEntry _entry;
-    private Listener _listener;
 
     public KeyProfile() {
         this(new DatabaseEntry());
@@ -23,10 +22,6 @@ public class KeyProfile implements Serializable {
         _entry = entry;
     }
 
-    public void setListener(Listener listener) {
-        _listener = listener;
-    }
-
     public DatabaseEntry getEntry() {
         return _entry;
     }
@@ -40,17 +35,10 @@ public class KeyProfile implements Serializable {
         } catch (Exception e) {
             throw new UndeclaredThrowableException(e);
         }
-        if (_listener != null) {
-            _listener.onRefreshCode(_code);
-        }
         return _code;
     }
 
     public TextDrawable getDrawable() {
         return TextDrawableHelper.generate(getEntry().getName());
     }
-
-    public interface Listener {
-        void onRefreshCode(String code);
-    }
 }
diff --git a/app/src/main/java/me/impy/aegis/KeyProfileAdapter.java b/app/src/main/java/me/impy/aegis/KeyProfileAdapter.java
index 904f5039..0b34d5bd 100644
--- a/app/src/main/java/me/impy/aegis/KeyProfileAdapter.java
+++ b/app/src/main/java/me/impy/aegis/KeyProfileAdapter.java
@@ -58,6 +58,7 @@ public class KeyProfileAdapter extends RecyclerView.Adapter<KeyProfileHolder> im
         for (KeyProfile profile : _keyProfiles) {
             profile.refreshCode();
         }
+        notifyDataSetChanged();
     }
 
     private KeyProfile getKeyByID(long id) {
diff --git a/app/src/main/java/me/impy/aegis/KeyProfileHolder.java b/app/src/main/java/me/impy/aegis/KeyProfileHolder.java
index 54c04b43..c612247c 100644
--- a/app/src/main/java/me/impy/aegis/KeyProfileHolder.java
+++ b/app/src/main/java/me/impy/aegis/KeyProfileHolder.java
@@ -11,7 +11,7 @@ import android.widget.TextView;
 
 import com.amulyakhare.textdrawable.TextDrawable;
 
-public class KeyProfileHolder extends RecyclerView.ViewHolder implements KeyProfile.Listener {
+public class KeyProfileHolder extends RecyclerView.ViewHolder {
     private TextView _profileName;
     private TextView _profileCode;
     private TextView _profileIssuer;
@@ -34,14 +34,12 @@ public class KeyProfileHolder extends RecyclerView.ViewHolder implements KeyProf
 
     public void setData(KeyProfile profile, boolean showIssuer) {
         if (profile == null) {
-            _profile.setListener(null);
             _profile = null;
             _running = false;
             return;
         }
         _profile = profile;
 
-        profile.setListener(this);
         _profileName.setText(profile.getEntry().getName());
         _profileCode.setText(profile.getCode());
         _profileIssuer.setText("");
@@ -59,20 +57,21 @@ public class KeyProfileHolder extends RecyclerView.ViewHolder implements KeyProf
         }
         _running = true;
 
-        _profile.refreshCode();
+        refreshCode();
         _uiHandler.postDelayed(new Runnable() {
             @Override
             public void run() {
                 if (_running) {
-                    _profile.refreshCode();
+                    refreshCode();
                     _uiHandler.postDelayed(this, _profile.getEntry().getInfo().getMillisTillNextRotation());
                 }
             }
         }, _profile.getEntry().getInfo().getMillisTillNextRotation());
     }
 
-    @Override
-    public void onRefreshCode(String otp) {
+    public void refreshCode() {
+        String otp = _profile.refreshCode();
+
         // reset the progress bar
         int maxProgress = _progressBar.getMax();
         _progressBar.setProgress(maxProgress);