SQL Query / Native Query Refresh issue

Hey all, 

Was wondering if anyone would have a fix or suggestion with the following problem I am facing. 

For background information, I have multiple SQL Database Sources and for each source, I have a dataflow tied in with the gateway where the SQL Database is installed.

I initially used to bring in the raw tables and transform the data from the SQL source to the format that I require (it is the same format for all sources) using power Query. Since they are all the same format after transformation, I append the queries in a separate dataflow and use the appended dataflow as my PBI report source.

I recently started using Native Query to query in data from my SQL database onto Power Query in the format that I want rather than using Power Query transformations which works much faster. However, if for whatever reason, in the scheduled refresh, if the dataflow is unable to refresh for reason like the data gateway being off etc., then the data for that sql source disappears from the report after refresh. Whereas in my old method, if there was a refresh error, I would still retain the data that was there in the last sucessful refresh.

Was wondering if anyone had the same issue and how it was addressed.