diff --git a/python/paddle/fluid/layers/math_op_patch.py b/python/paddle/fluid/layers/math_op_patch.py
index d86b3bbf491a66b58464a4ae7202d04025b9fb82..ab80133be67e9a4e8662aec103a4eff0fc861800 100644
--- a/python/paddle/fluid/layers/math_op_patch.py
+++ b/python/paddle/fluid/layers/math_op_patch.py
@@ -72,17 +72,23 @@ def monkey_patch_variable():
         block = current_block(ref_var)
         var = create_new_tmp_var(block, dtype)
         batch_dim = -1
+        out_shape = []
         for i, d in enumerate(ref_var.shape):
             if d < 0:
-                batch_dim = i
-                break
+                if batch_dim < 0:
+                    batch_dim = i
+                    out_shape.append(d)
+                else:
+                    out_shape.append(1)
+            else:
+                out_shape.append(d)
         assert batch_dim != -1
         block.append_op(
             type='fill_constant_batch_size_like',
             outputs={'Out': [var]},
             inputs={'Input': [ref_var]},
             attrs={
-                'shape': ref_var.shape,
+                'shape': out_shape,
                 'value': value,
                 'input_dim_idx': batch_dim,
                 'output_dim_idx': batch_dim
diff --git a/python/paddle/fluid/tests/unittests/test_elementwise_div_op.py b/python/paddle/fluid/tests/unittests/test_elementwise_div_op.py
index 6ee36aa93fbbacf46c6a94d06893a8bcbd1f5ff6..b8a1bacc30cf60de366981d8eae3c28c42723b63 100644
--- a/python/paddle/fluid/tests/unittests/test_elementwise_div_op.py
+++ b/python/paddle/fluid/tests/unittests/test_elementwise_div_op.py
@@ -227,5 +227,18 @@ class TestElementwiseDivOpFp16(ElementwiseDivOp):
             ['X'], 'Out', max_relative_error=1, no_grad_set=set('Y'))
 
 
+class TestElementwiseDivBroadcast(unittest.TestCase):
+    def test_shape_with_batch_sizes(self):
+        with fluid.program_guard(fluid.Program()):
+            x_var = fluid.data(
+                name='x', dtype='float32', shape=[None, 3, None, None])
+            one = 2.
+            out = one / x_var
+            exe = fluid.Executor(fluid.CPUPlace())
+            x = np.random.uniform(0.1, 0.6, (1, 3, 32, 32)).astype("float32")
+            out_result, = exe.run(feed={'x': x}, fetch_list=[out])
+            self.assertEqual((out_result == (2 / x)).all(), True)
+
+
 if __name__ == '__main__':
     unittest.main()