diff --git a/python/paddle/fluid/dygraph/layers.py b/python/paddle/fluid/dygraph/layers.py
index 168b894d56367335d413a813ae7cee7889738660..490c6a1ca76d49198306f293cb52b39383e470e6 100644
--- a/python/paddle/fluid/dygraph/layers.py
+++ b/python/paddle/fluid/dygraph/layers.py
@@ -1594,7 +1594,8 @@ class Layer(object):
                                             blocking)
 
         for key, buf in self._buffers.items():
-            self._buffers[key] = func(buf, device, dtype, blocking)
+            if buf is not None:
+                self._buffers[key] = func(buf, device, dtype, blocking)
 
         self._dtype = dtype
 
diff --git a/python/paddle/fluid/tests/unittests/test_base_layer.py b/python/paddle/fluid/tests/unittests/test_base_layer.py
index bb5c691a6e074b725918bab68f1d77ade1db9d00..dbfb1844fb0c0d6bb3f1f73e56d2eae1852d62ec 100644
--- a/python/paddle/fluid/tests/unittests/test_base_layer.py
+++ b/python/paddle/fluid/tests/unittests/test_base_layer.py
@@ -559,16 +559,25 @@ class TestLayerTo(unittest.TestCase):
             else:
                 self.assertTrue(isinstance(p, paddle.fluid.framework.ParamBase))
 
+    def func_test_to_api_none_buffer(self):
+        model = paddle.nn.Linear(2, 4)
+        buffer = None
+        model.register_buffer("buf_name", buffer, persistable=True)
+        model.to(dtype='float64')
+        self.assertEqual(model._buffers['buf_name'], None)
+
     def test_main(self):
         with _test_eager_guard():
             self.funcsetUp()
             self.func_test_to_api()
             self.func_test_to_api_paddle_dtype()
             self.func_test_to_api_numpy_dtype()
+            self.func_test_to_api_none_buffer()
         self.funcsetUp()
         self.func_test_to_api()
         self.func_test_to_api_paddle_dtype()
         self.func_test_to_api_numpy_dtype()
+        self.func_test_to_api_none_buffer()
 
 
 if __name__ == '__main__':