diff --git a/mq/main/mq-broker/persist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/DestinationDAOImpl.java b/mq/main/mq-broker/persist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/DestinationDAOImpl.java
index f4d559538..6375df1d6 100644
--- a/mq/main/mq-broker/persist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/DestinationDAOImpl.java
+++ b/mq/main/mq-broker/persist-jdbc/src/main/java/com/sun/messaging/jmq/jmsserver/persist/jdbc/DestinationDAOImpl.java
@@ -146,13 +146,6 @@ class DestinationDAOImpl extends BaseDAOImpl implements DestinationDAO {
             .append(   dbMgr.getTableName( MessageDAO.TABLE_NAME_PREFIX ) )
             .append(   " WHERE " )
             .append(   MessageDAO.DESTINATION_ID_COLUMN ).append( " = ?)" )
-            .append( " AND NOT EXISTS (SELECT * FROM " )
-            .append(   dbMgr.getTableName( BrokerDAO.TABLE_NAME_PREFIX ) )
-            .append(   " WHERE " )
-            .append(   BrokerDAO.ID_COLUMN ).append( " <> ? " )
-            .append(   " AND " )
-            .append(   BrokerDAO.STATE_COLUMN ).append( " = " )
-            .append(   BrokerState.I_OPERATING ).append( ")" )
             .toString();
 
         selectSQL = new StringBuffer(128)
@@ -556,7 +549,6 @@ public boolean delete( Connection conn, DestinationUID dstUID,
                 pstmt = dbMgr.createPreparedStatement( conn, sql );
                 pstmt.setString( 1, destName );
                 pstmt.setString( 2, destName );
-                pstmt.setString( 3, dbMgr.getBrokerID() );
             } else {
                 sql = deleteSQL;
                 pstmt = dbMgr.createPreparedStatement( conn, sql );