diff --git a/library/mps/common.h b/library/mps/common.h
index becd1778d..84c584105 100644
--- a/library/mps/common.h
+++ b/library/mps/common.h
@@ -48,7 +48,7 @@
 #define MBEDTLS_MPS_ENABLE_ASSERTIONS
 
 /*! This flag controls whether tracing for MPS should be enabled. */
-#define MBEDTLS_MPS_TRACE
+//#define MBEDTLS_MPS_TRACE
 
 /* \} name SECTION: MPS Configuration */
 
diff --git a/library/mps/trace.h b/library/mps/trace.h
new file mode 100644
index 000000000..1ce079de8
--- /dev/null
+++ b/library/mps/trace.h
@@ -0,0 +1,45 @@
+/*
+ *  Copyright The Mbed TLS Contributors
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+ *  not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+/**
+ * \file trace.h
+ *
+ * \brief Tracing module for MPS
+ */
+
+#ifndef MBEDTLS_MPS_TRACE_H
+#define MBEDTLS_MPS_TRACE_H
+
+#include "common.h"
+
+#if defined(MBEDTLS_MPS_TRACE)
+
+#error "MPS tracing module not yet implemented"
+
+#else /* MBEDTLS_MPS_TRACE */
+
+#define TRACE( type, fmt, ... ) do { } while( 0 )
+#define TRACE_INIT( fmt, ... )  do { } while( 0 )
+#define TRACE_END               do { } while( 0 )
+
+#define RETURN( val ) return( val );
+
+#endif /* MBEDTLS_MPS_TRACE */
+
+#endif /* MBEDTLS_MPS_TRACE_H */