diff --git a/hipamd/src/hip_memory.cpp b/hipamd/src/hip_memory.cpp
index af7ac78233..401682c38b 100644
--- a/hipamd/src/hip_memory.cpp
+++ b/hipamd/src/hip_memory.cpp
@@ -1093,7 +1093,7 @@ amd::Image* ihipImageCreate(const cl_channel_order channelOrder,
                                        imageType,
                                        CL_MEM_READ_WRITE,
                                        imageFormat,
-                                       imageWidth,
+                                       (imageWidth == 0) ? 1 : imageWidth,
                                        (imageHeight == 0) ? 1 : imageHeight,
                                        (imageDepth == 0) ? 1 : imageDepth,
                                        imageRowPitch,
diff --git a/rocclr/platform/memory.cpp b/rocclr/platform/memory.cpp
index 8d515df9bc..b03f1a8b7d 100644
--- a/rocclr/platform/memory.cpp
+++ b/rocclr/platform/memory.cpp
@@ -685,10 +685,6 @@ bool Image::validateDimensions(const std::vector<amd::Device*>& devices, cl_mem_
       }
     // Fall through...
     case CL_MEM_OBJECT_IMAGE2D:
-      if ((width == 0) || (height == 0)) {
-        DevLogPrintfError("Invalid dimensions width: %u height: %u \n", width, height);
-        return false;
-      }
       for (const auto dev : devices) {
         if ((dev->info().image2DMaxHeight_ >= height) && (dev->info().image2DMaxWidth_ >= width)) {
           return true;
@@ -724,10 +720,6 @@ bool Image::validateDimensions(const std::vector<amd::Device*>& devices, cl_mem_
       }
       break;
     case CL_MEM_OBJECT_IMAGE1D_BUFFER:
-      if (width == 0) {
-        DevLogError("Invalid dimension \n");
-        return false;
-      }
       for (const auto& dev : devices) {
         if (dev->info().imageMaxBufferSize_ >= width) {
           return true;