diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9ddfa195420d1b064be7caeb3ee8a93383f830f..d190850f65cf61c5e450b25dbf14df6e1db8ca6d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -653,6 +653,10 @@ if( CHAMELEON_SCHED_STARPU )
         if ( HAVE_STARPU_MALLOC_ON_NODE_SET_DEFAULT_FLAGS )
             message("-- ${Blue}Add definition HAVE_STARPU_MALLOC_ON_NODE_SET_DEFAULT_FLAGS${ColourReset}")
         endif()
+        check_function_exists(starpu_data_set_ooc_flag HAVE_STARPU_DATA_SET_OOC_FLAGS)
+        if ( HAVE_STARPU_DATA_SET_OOC_FLAGS )
+            message("-- ${Blue}Add definition HAVE_STARPU_DATA_SET_OOC_FLAGS${ColourReset}")
+        endif()
         check_function_exists(starpu_mpi_init_conf HAVE_STARPU_MPI_INIT_CONF)
         if ( HAVE_STARPU_MPI_INIT_CONF )
             message("-- ${Blue}Add definition HAVE_STARPU_MPI_INIT_CONF${ColourReset}")
diff --git a/runtime/starpu/control/runtime_descriptor.c b/runtime/starpu/control/runtime_descriptor.c
index 7cb55b12a30be1237214d99fc9e2fd79994e8d87..92b63ce46f24f9b33f2499e88f55b218c9f1756e 100644
--- a/runtime/starpu/control/runtime_descriptor.c
+++ b/runtime/starpu/control/runtime_descriptor.c
@@ -4,7 +4,7 @@
  *
  * @copyright 2009-2014 The University of Tennessee and The University of
  *                      Tennessee Research Foundation. All rights reserved.
- * @copyright 2012-2018 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
+ * @copyright 2012-2019 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria,
  *                      Univ. Bordeaux. All rights reserved.
  *
  ***
@@ -470,7 +470,13 @@ void *RUNTIME_data_getaddr( const CHAM_desc_t *A, int m, int n )
                                      BLKLDD(A, m),
                                      tempmm, tempnn, eltsze );
 
-#ifdef HAVE_STARPU_DATA_SET_COORDINATES
+#if defined(HAVE_STARPU_DATA_SET_OOC_FLAG)
+        if ( A->ooc == 0 ) {
+            starpu_data_set_ooc_flag( *ptrtile, 0 );
+        }
+#endif
+
+#if defined(HAVE_STARPU_DATA_SET_COORDINATES)
         starpu_data_set_coordinates( *ptrtile, 2, m, n );
 #endif
 
diff --git a/runtime/starpu/include/chameleon_starpu.h.in b/runtime/starpu/include/chameleon_starpu.h.in
index c7508388c74028bfb44aa4b851bc5758e40ce87d..920aeeb8e83991af8a6ed2bd112abe1d024b14d7 100644
--- a/runtime/starpu/include/chameleon_starpu.h.in
+++ b/runtime/starpu/include/chameleon_starpu.h.in
@@ -30,6 +30,7 @@
 #cmakedefine HAVE_STARPU_DATA_WONT_USE
 #cmakedefine HAVE_STARPU_DATA_SET_COORDINATES
 #cmakedefine HAVE_STARPU_MALLOC_ON_NODE_SET_DEFAULT_FLAGS
+#cmakedefine HAVE_STARPU_DATA_SET_OOC_FLAGS
 #cmakedefine HAVE_STARPU_MPI_DATA_MIGRATE
 #cmakedefine HAVE_STARPU_MPI_DATA_REGISTER
 #cmakedefine HAVE_STARPU_MPI_COMM_RANK