diff --git a/src/main/java/dan200/computercraft/shared/common/BlockGeneric.java b/src/main/java/dan200/computercraft/shared/common/BlockGeneric.java
index cf65d541b..589548f61 100644
--- a/src/main/java/dan200/computercraft/shared/common/BlockGeneric.java
+++ b/src/main/java/dan200/computercraft/shared/common/BlockGeneric.java
@@ -111,13 +111,13 @@ public abstract class BlockGeneric extends Block implements
     public final void breakBlock( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState newState )
     {
         TileEntity tile = world.getTileEntity( pos );
+        super.breakBlock( world, pos, newState );
+        world.removeTileEntity( pos );
         if( tile != null && tile instanceof TileGeneric )
         {
             TileGeneric generic = (TileGeneric)tile;
             generic.destroy();
         }
-        super.breakBlock( world, pos, newState );
-        world.removeTileEntity( pos );
     }
 
     @Nonnull