diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6245610a3..72749d05a 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Refined Storage Changelog
 
+### 1.0.1
+- Fixed advanced tooltips showing in Grid when not configured to do so (raoulvdberge)
+
 ### 1.0
 **NOTE:** Due to the new crafting system, all Crafting Patterns made before 1.0 have to be re-made.
 
diff --git a/src/main/java/refinedstorage/gui/grid/stack/ClientStackItem.java b/src/main/java/refinedstorage/gui/grid/stack/ClientStackItem.java
index 3cbb3df03..5b01f9003 100755
--- a/src/main/java/refinedstorage/gui/grid/stack/ClientStackItem.java
+++ b/src/main/java/refinedstorage/gui/grid/stack/ClientStackItem.java
@@ -48,7 +48,7 @@ public class ClientStackItem implements IClientStack {
 
     @Override
     public String getTooltip() {
-        return Strings.join(stack.getTooltip(Minecraft.getMinecraft().thePlayer, true), "\n");
+        return Strings.join(stack.getTooltip(Minecraft.getMinecraft().thePlayer, Minecraft.getMinecraft().gameSettings.advancedItemTooltips), "\n");
     }
 
     @Override