diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DStoreStatusMonitor.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DStoreStatusMonitor.java
index 9e73a57ab87..e4fc92ce615 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DStoreStatusMonitor.java
+++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/util/DStoreStatusMonitor.java
@@ -18,7 +18,8 @@
  * David McKnight   (IBM)        - [209593] [api] check for existing query to avoid duplicates
  * David McKnight   (IBM)        - [225902] [dstore] use C_NOTIFICATION command to wake up the server
  * David McKnight   (IBM)        - [231126] [dstore] status monitor needs to reset WaitThreshold on nudge
- * David McKnight  (IBM)  - [261644] [dstore] remote search improvements
+ * David McKnight   (IBM)        - [261644] [dstore] remote search improvements
+ * David McKnight   (IBM)        - [283157] [dstore] Remote search didn't end when the dstore server crashed
  *******************************************************************************/
 
 package org.eclipse.rse.services.dstore.util;
@@ -277,7 +278,8 @@ public class DStoreStatusMonitor implements IDomainListener
 				}
 				else
 				{
-					if ((monitor != null) && (monitor.isCanceled()))
+					if ((monitor != null && monitor.isCanceled()) || 
+								!status.getDataStore().getStatus().getName().equals("okay")) // datastore not okay?
 					{
 						setCancelled(status);
 						throw new InterruptedException();