diff --git a/SDWebImage/Core/SDImageCache.m b/SDWebImage/Core/SDImageCache.m
index ad72953e..ca0bf9cd 100644
--- a/SDWebImage/Core/SDImageCache.m
+++ b/SDWebImage/Core/SDImageCache.m
@@ -537,13 +537,11 @@ static NSString * _defaultDiskCacheDirectory;
                     SDImageCacheType cacheType = [context[SDWebImageContextStoreCacheType] integerValue];
                     shouldCacheToMomery = (cacheType == SDImageCacheTypeAll || cacheType == SDImageCacheTypeMemory);
                 }
-                if (shouldCacheToMomery) {
-                    // decode image data only if in-memory cache missed
-                    diskImage = [self diskImageForKey:key data:diskData options:options context:context];
-                    if (diskImage && self.config.shouldCacheImagesInMemory) {
-                        NSUInteger cost = diskImage.sd_memoryCost;
-                        [self.memoryCache setObject:diskImage forKey:key cost:cost];
-                    }
+                // decode image data only if in-memory cache missed
+                diskImage = [self diskImageForKey:key data:diskData options:options context:context];
+                if (shouldCacheToMomery && diskImage && self.config.shouldCacheImagesInMemory) {
+                    NSUInteger cost = diskImage.sd_memoryCost;
+                    [self.memoryCache setObject:diskImage forKey:key cost:cost];
                 }
             }
             
diff --git a/Tests/Tests/SDImageCacheTests.m b/Tests/Tests/SDImageCacheTests.m
index a8d6c18b..91f0d572 100644
--- a/Tests/Tests/SDImageCacheTests.m
+++ b/Tests/Tests/SDImageCacheTests.m
@@ -632,6 +632,7 @@ static NSString *kTestImageKeyPNG = @"TestImageKey.png";
     [[SDImageCache sharedImageCache] storeImageDataToDisk:data forKey:kTestImageKeyJPEG];
     
     [[SDImageCachesManager sharedManager] queryImageForKey:kTestImageKeyJPEG options:0 context:@{SDWebImageContextStoreCacheType : @(SDImageCacheTypeDisk)} cacheType:SDImageCacheTypeAll completion:^(UIImage * _Nullable image, NSData * _Nullable data, SDImageCacheType cacheType) {
+        expect(image).notTo.beNil();
         expect([[SDImageCache sharedImageCache] imageFromMemoryCacheForKey:kTestImageKeyJPEG]).beNil();
         [expectation fulfill];
     }];