diff --git a/delegate/src/DelegateUtils.hpp b/delegate/src/DelegateUtils.hpp
index 940d269..e0de809 100644
--- a/delegate/src/DelegateUtils.hpp
+++ b/delegate/src/DelegateUtils.hpp
@@ -420,6 +420,7 @@
                                            safeShape.data(),
                                            dimensionsSpecificity);
             ret = armnn::TensorInfo(tensorShape, type);
+            ret.SetConstant(true);
         }
         else
         {
@@ -442,7 +443,16 @@
         armnn::TensorShape tensorShape(static_cast<unsigned int>(tensorDimensionSize),
                                        tensorDims.data(),
                                        dimensionsSpecificity);
-        ret = armnn::TensorInfo(tensorShape, type);
+
+        if(tflite::IsConstantTensor(&tfLiteTensor))
+        {
+            ret = armnn::TensorInfo(tensorShape, type);
+            ret.SetConstant(true);
+        }
+        else
+        {
+            ret = armnn::TensorInfo(tensorShape, type);
+        }
     }
 
     auto quantizationInfo = tfLiteTensor.quantization;
diff --git a/delegate/src/armnn_delegate.cpp b/delegate/src/armnn_delegate.cpp
index 4c1bc57..0069b4f 100644
--- a/delegate/src/armnn_delegate.cpp
+++ b/delegate/src/armnn_delegate.cpp
@@ -422,7 +422,9 @@
         if (tensor->allocation_type != kTfLiteMmapRo)
         {
             const armnn::BindingPointInfo& inputBinding = m_InputBindings[inputIndex];
-            const armnn::ConstTensor inputTensor(inputBinding.second, tensor->data.data);
+            armnn::TensorInfo inputTensorInfo = inputBinding.second;
+            inputTensorInfo.SetConstant(true);
+            const armnn::ConstTensor inputTensor(inputTensorInfo, tensor->data.data);
             inputTensors.emplace_back(inputIdx, inputTensor);
 
             ++inputIndex;