diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing/IRoutingInputsExtensions.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing/IRoutingInputsExtensions.cs
index 4ff9f123..aeb08088 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing/IRoutingInputsExtensions.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Routing/IRoutingInputsExtensions.cs	
@@ -152,7 +152,8 @@ namespace PepperDash.Essentials.Core
 				if (outputPortToUse == null)
 				{
 					// it's a sink device
-					routeTable.Routes.Add(new RouteSwitchDescriptor(goodInputPort));
+                    if (destination is IRoutingSinkWithSwitching)
+                        routeTable.Routes.Add(new RouteSwitchDescriptor(goodInputPort));
 				}
 				else if (destination is IRouting)
 				{