diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java
index ac1bedb9e..2dbc89033 100644
--- a/src/main/java/appeng/container/AEBaseContainer.java
+++ b/src/main/java/appeng/container/AEBaseContainer.java
@@ -356,6 +356,11 @@ public abstract class AEBaseContainer extends Container
 
 		if( Platform.isServer() )
 		{
+			if( this.tileEntity != null && this.tileEntity.getWorld().getTileEntity( this.tileEntity.getPos() ) != this.tileEntity )
+			{
+				this.setValidContainer( false );
+			}
+
 			for( final IContainerListener listener : this.listeners )
 			{
 				for( final SyncData sd : this.syncData.values() )
diff --git a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java
index ccc795f86..76dc341d8 100644
--- a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java
+++ b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java
@@ -148,11 +148,6 @@ public class ContainerCellWorkbench extends ContainerUpgradeable
 		final ItemStack is = this.workBench.getInventoryByName( "cell" ).getStackInSlot( 0 );
 		if( Platform.isServer() )
 		{
-			if( this.workBench.getWorld().getTileEntity( this.workBench.getPos() ) != this.workBench )
-			{
-				this.setValidContainer( false );
-			}
-
 			for( final IContainerListener listener : this.listeners )
 			{
 				if( this.prevStack != is )