diff --git a/src/dawn/native/Buffer.cpp b/src/dawn/native/Buffer.cpp
index 83f56e7845..6cbcb4022a 100644
--- a/src/dawn/native/Buffer.cpp
+++ b/src/dawn/native/Buffer.cpp
@@ -251,6 +251,9 @@ wgpu::BufferMapState BufferBase::APIGetMapState() const {
         case BufferState::Unmapped:
         case BufferState::Destroyed:
             return wgpu::BufferMapState::Unmapped;
+        default:
+            UNREACHABLE();
+            return wgpu::BufferMapState::Unmapped;
     }
 }
 
diff --git a/src/dawn/native/Pipeline.cpp b/src/dawn/native/Pipeline.cpp
index 3e2dada7dd..7a217a5875 100644
--- a/src/dawn/native/Pipeline.cpp
+++ b/src/dawn/native/Pipeline.cpp
@@ -164,6 +164,9 @@ WGPUCreatePipelineAsyncStatus CreatePipelineAsyncStatusFromErrorType(InternalErr
         case InternalErrorType::Internal:
         case InternalErrorType::OutOfMemory:
             return WGPUCreatePipelineAsyncStatus_InternalError;
+        default:
+            UNREACHABLE();
+            return WGPUCreatePipelineAsyncStatus_Unknown;
     }
 }