diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java
index 2034ff272ea..bd632b8d800 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/view/SystemViewRemoteFileAdapter.java
@@ -20,6 +20,7 @@
  * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() 
  * Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes 
  * Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
+ * Martin Oberhuber (Wind River) - [186997] No deferred queries in Local Files
  ********************************************************************************/
 
 package org.eclipse.rse.internal.files.ui.view;
@@ -3238,7 +3239,7 @@ public class SystemViewRemoteFileAdapter
 	 */
 	public boolean supportsDeferredQueries(ISubSystem subSys)
 	{
-	    return true;
+		return !subSys.getHost().getSystemType().isLocal();
 	}
 	
 
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java
index b70d3cceb6b..6e7a54b7c96 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java
@@ -12,6 +12,7 @@
  * 
  * Contributors:
  * Martin Oberhuber (Wind River) - [177523] Unify singleton getter methods
+ * Martin Oberhuber (Wind River) - [186997] No deferred queries in Local Files
  ********************************************************************************/
 
 package org.eclipse.rse.subsystems.files.local;
@@ -204,6 +205,11 @@ public class LocalFileSubSystemConfiguration extends FileServiceSubSystemConfigu
 		return false;
 	}
 
+	public boolean supportsDeferredQueries() {
+		//No need for deferred queries in Local, since these are always fast
+		return false;
+	}
+
 	public IConnectorService getConnectorService(IHost host)
 	{
 		return LocalConnectorServiceManager.getInstance().getConnectorService(host, getServiceImplType());