<?php

function ccd_no_redirect_on_404( $redirect_url ) {
    
    if ( is_404() ) {
        return false;
    }
    
    return $redirect_url;
    
}
add_filter( 'redirect_canonical', 'ccd_no_redirect_on_404' );