diff --git a/build.gradle.kts b/build.gradle.kts
index b5da34a4..d3570b47 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
     id("maven-publish")
     id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.7"
     id("eclipse")
-    id("com.gtnewhorizons.retrofuturagradle") version "1.4.0"
+    id("com.gtnewhorizons.retrofuturagradle") version "1.4.1"
 }
 
 // Project properties
diff --git a/src/main/java/hellfirepvp/modularmachinery/common/tiles/base/TileMultiblockMachineController.java b/src/main/java/hellfirepvp/modularmachinery/common/tiles/base/TileMultiblockMachineController.java
index bc4e7019..e04b8b4f 100644
--- a/src/main/java/hellfirepvp/modularmachinery/common/tiles/base/TileMultiblockMachineController.java
+++ b/src/main/java/hellfirepvp/modularmachinery/common/tiles/base/TileMultiblockMachineController.java
@@ -396,7 +396,9 @@ protected void resetMachine(boolean clearData) {
         }
         updateStatedMachineComponentSync(false);
 
-        prevMachine = foundMachine;
+        if (foundMachine != null) {
+            prevMachine = foundMachine;
+        }
         foundMachine = null;
         foundPattern = null;
         foundReplacements = null;