diff --git a/src/main/java/org/cyclops/integratedterminals/client/gui/container/ContainerScreenTerminalStorage.java b/src/main/java/org/cyclops/integratedterminals/client/gui/container/ContainerScreenTerminalStorage.java
index 9a4322f62..2c116e9e2 100644
--- a/src/main/java/org/cyclops/integratedterminals/client/gui/container/ContainerScreenTerminalStorage.java
+++ b/src/main/java/org/cyclops/integratedterminals/client/gui/container/ContainerScreenTerminalStorage.java
@@ -214,7 +214,11 @@ public void containerTick() {
         super.containerTick();
         if (!initialized && getSelectedClientTab().isPresent()) {
             initialized = true;
-            fieldSearch.setValue(getSelectedClientTab().get().getInstanceFilter(getMenu().getSelectedChannel()));
+            String filter = getSelectedClientTab().get().getInstanceFilter(getMenu().getSelectedChannel());
+            if (filter != null && !"".equals(filter)) {
+                fieldSearch.setValue(filter);
+                getSelectedClientTab().get().setInstanceFilter(getMenu().getSelectedChannel(), filter); // Forces event to be sent
+            }
         }
         fieldSearch.tick();
     }