diff --git a/client/gui/AEBaseGui.java b/client/gui/AEBaseGui.java
index 10f27418f..17971c1ab 100644
--- a/client/gui/AEBaseGui.java
+++ b/client/gui/AEBaseGui.java
@@ -42,6 +42,7 @@ import appeng.core.AELog;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.PacketInventoryAction;
 import appeng.helpers.InventoryAction;
+import appeng.parts.automation.UpgradeInventory;
 import appeng.util.Platform;
 
 public abstract class AEBaseGui extends GuiContainer
@@ -559,7 +560,7 @@ public abstract class AEBaseGui extends GuiContainer
 					if ( ((AppEngSlot) s).isValid == hasCalculatedValidness.NotAvailable )
 					{
 						boolean isValid = s.isItemValid( is ) || s instanceof SlotOutput || s instanceof AppEngCraftingSlot || s instanceof SlotDisabled
-								|| s instanceof SlotInaccessable || s instanceof SlotFake;
+								|| s instanceof SlotInaccessable || s instanceof SlotFake || s.inventory instanceof UpgradeInventory;
 						if ( isValid && s instanceof SlotRestrictedInput )
 						{
 							try
diff --git a/container/slot/SlotRestrictedInput.java b/container/slot/SlotRestrictedInput.java
index 23d5f3118..036511006 100644
--- a/container/slot/SlotRestrictedInput.java
+++ b/container/slot/SlotRestrictedInput.java
@@ -14,7 +14,6 @@ import appeng.api.implementations.items.ISpatialStorageCell;
 import appeng.api.implementations.items.IStorageComponent;
 import appeng.api.implementations.items.IUpgradeModule;
 import appeng.api.storage.ICellWorkbenchItem;
-import appeng.parts.automation.UpgradeInventory;
 import appeng.util.Platform;
 
 public class SlotRestrictedInput extends AppEngSlot
@@ -95,7 +94,7 @@ public class SlotRestrictedInput extends AppEngSlot
 		if ( i.getItem() == null )
 			return false;
 
-		if ( !inventory.isItemValidForSlot( this.getSlotIndex(), i ) && !(inventory instanceof UpgradeInventory) )
+		if ( !inventory.isItemValidForSlot( this.getSlotIndex(), i ) )
 			return false;
 
 		IAppEngApi api = AEApi.instance();