diff --git a/src/main/java/io/bitsquare/gui/Activatable.java b/src/main/java/io/bitsquare/gui/Activatable.java
index 7e3a15fec5..7dbd073f7f 100644
--- a/src/main/java/io/bitsquare/gui/Activatable.java
+++ b/src/main/java/io/bitsquare/gui/Activatable.java
@@ -21,4 +21,16 @@ public interface Activatable {
     void activate();
 
     void deactivate();
+
+
+    Activatable NOOP_INSTANCE = new Activatable() {;
+        @Override
+        public void activate() {
+        }
+
+        @Override
+        public void deactivate() {
+        }
+    };
+
 }
diff --git a/src/main/java/io/bitsquare/gui/CachedViewCB.java b/src/main/java/io/bitsquare/gui/CachedViewCB.java
index 4978a61536..458341ecbc 100644
--- a/src/main/java/io/bitsquare/gui/CachedViewCB.java
+++ b/src/main/java/io/bitsquare/gui/CachedViewCB.java
@@ -33,22 +33,12 @@ import static com.google.common.base.Preconditions.checkNotNull;
 public class CachedViewCB<M extends Activatable> extends ViewCB<M> implements Activatable {
     private static final Logger log = LoggerFactory.getLogger(CachedViewCB.class);
 
-    protected static final Activatable EMPTY_MODEL = new Activatable() {
-        @Override
-        public void activate() {
-        }
-
-        @Override
-        public void deactivate() {
-        }
-    };
-
     public CachedViewCB(M model) {
         super(checkNotNull(model, "Model must not be null"));
     }
 
     public CachedViewCB() {
-        this((M) EMPTY_MODEL);
+        this((M) Activatable.NOOP_INSTANCE);
     }