diff --git a/Gems/Atom/Feature/Common/Assets/Scripts/material_find_overrides_demo.lua b/Gems/Atom/Feature/Common/Assets/Scripts/material_find_overrides_demo.lua
index 41df35e355..4a1b8c8f06 100644
--- a/Gems/Atom/Feature/Common/Assets/Scripts/material_find_overrides_demo.lua
+++ b/Gems/Atom/Feature/Common/Assets/Scripts/material_find_overrides_demo.lua
@@ -22,6 +22,7 @@ local FindMaterialAssignmentTest =
             "materials/presets/macbeth/12_orange_yellow_srgb.tif.streamingimage",
             "materials/presets/macbeth/17_magenta_srgb.tif.streamingimage"
         }, 
+        MaterialSlotFilter = ""
     }, 
 }
 
@@ -50,18 +51,6 @@ function FindMaterialAssignmentTest:OnActivate()
     self.colors = {}
     self.lerpDirs = {}
 
-    self.assignmentIds =
-    {
-        MaterialComponentRequestBus.Event.FindMaterialAssignmentId(self.entityId, -1, "lambert"),
-    }
-
-    for index = 1, #self.assignmentIds do
-        local id = self.assignmentIds[index]
-        if (id ~= nil) then
-            self.colors[index] = randomColor()
-            self.lerpDirs[index] = randomDir()
-        end
-    end
     self.tickBusHandler = TickBus.Connect(self);
 end
 
@@ -144,10 +133,33 @@ function FindMaterialAssignmentTest:lerpColors(deltaTime)
 end
 
 function FindMaterialAssignmentTest:OnTick(deltaTime, timePoint)
+
+
+    if(nil == self.assignmentIds) then
+    
+        local originalAssignments = MaterialComponentRequestBus.Event.GetOriginalMaterialAssignments(self.entityId)
+        if(nil == originalAssignments or #originalAssignments <= 1) then -- There is always 1 entry for the default assignment; a loaded model will have at least 2 assignments
+            return
+        end
+        
+        self.assignmentIds =
+        {
+            MaterialComponentRequestBus.Event.FindMaterialAssignmentId(self.entityId, -1, self.Properties.MaterialSlotFilter),
+        }
+    
+        for index = 1, #self.assignmentIds do
+            local id = self.assignmentIds[index]
+            if (id ~= nil) then
+                self.colors[index] = randomColor()
+                self.lerpDirs[index] = randomDir()
+            end
+        end
+    end
+    
     self.timer = self.timer + deltaTime
     self.totalTime = self.totalTime + deltaTime
     self:lerpColors(deltaTime)
-
+    
     if (self.timer > self.timeUpdate and self.totalTime < self.totalTimeMax) then
         self.timer = self.timer - self.timeUpdate
         self:UpdateProperties()
@@ -155,6 +167,7 @@ function FindMaterialAssignmentTest:OnTick(deltaTime, timePoint)
         self:ClearProperties()
         self.tickBusHandler:Disconnect(self);
     end
+
 end
 
-return FindMaterialAssignmentTest
\ No newline at end of file
+return FindMaterialAssignmentTest