diff --git a/CHANGELOG.md b/CHANGELOG.md
index 130b5e006..c44c9fa8f 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Removed craft-only mode for the Exporter (raoulvdberge)
 - Fixed Exporter with Stack Upgrade not working correctly in Regulator Mode (raoulvdberge)
 - Fixed crash with the Constructor (raoulvdberge)
+- Fixed patterns being able to crash when no inputs are provided (raoulvdberge)
 
 ### 1.5.23
 - Fixed duplication bug with autocrafting (raoulvdberge)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java
index 1e0dc2d91..5884861b7 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java
@@ -140,7 +140,7 @@ public class CraftingPattern implements ICraftingPattern {
 
     @Override
     public boolean isValid() {
-        return inputs.stream().filter(Objects::nonNull).count() > 0 && !outputs.isEmpty();
+        return !inputs.isEmpty() && inputs.stream().filter(Objects::nonNull).count() > 0 && !outputs.isEmpty();
     }
 
     @Override